From: Gustavo Martin Morcuende Date: Sat, 22 Nov 2014 20:03:48 +0000 (+0100) Subject: Logo, action bar and notification icons from http://www.xaml-icon-studio.com/ X-Git-Tag: weatherinformation-1.0~32 X-Git-Url: https://git.gumartinm.name/?a=commitdiff_plain;h=920064e87daf508840183b1cea303e00b3e71506;p=AndroidWeatherInformation Logo, action bar and notification icons from xaml-icon-studio.com/ --- diff --git a/LICENSE.md b/LICENSE.md index 6088e16..41356a0 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -11,6 +11,18 @@ This license applies to the whole project with the exception of third party libr and files, which may be licensed under different licenses, as noted below. +## [XAML Icon Studio](http://www.xaml-icon-studio.com) + +The logo, action bar and notification icons used by this application were provided by +[http://www.xaml-icon-studio.com](http://www.xaml-icon-studio.com) The file was originally +taken from this url: [http://www.iconarchive.com/show/agriculture-icons-by-xaml-icon-studio/Sunflower-icon.html](http://www.iconarchive.com/show/agriculture-icons-by-xaml-icon-studio/Sunflower-icon.html) +Copyright holder [http://www.xaml-icon-studio.com](http://www.xaml-icon-studio.com) It is free for non-commercial +use but you may not use this icon without the explicit consent from the copyright holder. This license +applies to the following files: + + * ic_launcher.png + + ## [Jackson](http://wiki.fasterxml.com/JacksonHome) WeatherInformation uses **jackson-core-2.3.3.jar** library, which is licensed under the diff --git a/app/src/androidTest/res/drawable-hdpi/ic_launcher.png b/app/src/androidTest/res/drawable-hdpi/ic_launcher.png index 96a442e..129f4af 100644 Binary files a/app/src/androidTest/res/drawable-hdpi/ic_launcher.png and b/app/src/androidTest/res/drawable-hdpi/ic_launcher.png differ diff --git a/app/src/androidTest/res/drawable-ldpi/ic_launcher.png b/app/src/androidTest/res/drawable-ldpi/ic_launcher.png index 9923872..9768ca8 100644 Binary files a/app/src/androidTest/res/drawable-ldpi/ic_launcher.png and b/app/src/androidTest/res/drawable-ldpi/ic_launcher.png differ diff --git a/app/src/androidTest/res/drawable-mdpi/ic_launcher.png b/app/src/androidTest/res/drawable-mdpi/ic_launcher.png index 359047d..e5eb014 100644 Binary files a/app/src/androidTest/res/drawable-mdpi/ic_launcher.png and b/app/src/androidTest/res/drawable-mdpi/ic_launcher.png differ diff --git a/app/src/androidTest/res/drawable-xhdpi/ic_launcher.png b/app/src/androidTest/res/drawable-xhdpi/ic_launcher.png index 71c6d76..f84f2d0 100644 Binary files a/app/src/androidTest/res/drawable-xhdpi/ic_launcher.png and b/app/src/androidTest/res/drawable-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png index 288b665..129f4af 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_launcher.png and b/app/src/main/res/drawable-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png index 6ae570b..e5eb014 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_launcher.png and b/app/src/main/res/drawable-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png index d4fb7cd..f84f2d0 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_launcher.png and b/app/src/main/res/drawable-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png index 85a6081..f0d0969 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_launcher.png and b/app/src/main/res/drawable-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/raw/licenses.html b/app/src/main/res/raw/licenses.html index 5d4b711..0feae40 100644 --- a/app/src/main/res/raw/licenses.html +++ b/app/src/main/res/raw/licenses.html @@ -19,6 +19,17 @@ http://www.apache.org/licenses/LICENSE-2.0 +http://www.xaml-icon-studio.com +
+Copyright holder http://www.xaml-icon-studio.com
+
+It is free for non-commercial use but you may not use this icon without the explicit consent from the +copyright holder. +
+ +