Merge pull request #16 from NitroG42/master

Ic_launcher conflict with app one
2015-05-01 22:44:44 +02:00 · 2015-05-01 22:44:44 +02:00 · ee98ef9bff
parent 21286c901b 199f2d8ced
commit ee98ef9bff
5 changed files with 0 additions and 1 deletions
--- a/library/src/main/AndroidManifest.xml
+++ b/library/src/main/AndroidManifest.xml
@ -21,7 +21,6 @@
    <application
        android:allowBackup="true"
        android:label="@string/app_name"
-        android:icon="@drawable/ic_launcher"
        >

    </application>
--- a/library/src/main/res/drawable-hdpi/ic_launcher.png
+++ b/library/src/main/res/drawable-hdpi/ic_launcher.png
--- a/library/src/main/res/drawable-mdpi/ic_launcher.png
+++ b/library/src/main/res/drawable-mdpi/ic_launcher.png
--- a/library/src/main/res/drawable-xhdpi/ic_launcher.png
+++ b/library/src/main/res/drawable-xhdpi/ic_launcher.png
--- a/library/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ b/library/src/main/res/drawable-xxhdpi/ic_launcher.png