Merge branch 'master' of https://github.com/daimajia/AndroidViewAnima…

…tions
daimajia · Jun 24, 2014 · 2b04bd2 · 2b04bd2
2 parents 993ba99 + 7df690d
commit 2b04bd2
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ So, I started to collect animation effects... and in two days, this project born
 ```groovy
 dependencies {
     compile 'com.nineoldandroids:library:2.4.0'
-    compile 'com.daimajia.androidanimations:library:1.0.0@aar'
+    compile 'com.daimajia.androidanimations:library:1.0.1@aar'
 }
 ```
 or Maven
@@ -30,7 +30,7 @@ or Maven
 <dependency>
     <groupId>com.daimajia.androidanimation</groupId>
     <artifactId>library</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
     <type>apklib</type>
 </dependency>
 ```

diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
@@ -1,11 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.daimajia.androidanimations.library">
+<manifest package="com.daimajia.androidanimations.library">
 
-    <application android:allowBackup="true"
-        android:label="@string/app_name"
-        android:icon="@drawable/ic_launcher"
->
-
-    </application>
 
 </manifest>
diff --git a/library/src/main/res/drawable-hdpi/ic_launcher.png b/library/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/library/src/main/res/drawable-mdpi/ic_launcher.png b/library/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/library/src/main/res/drawable-xhdpi/ic_launcher.png b/library/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/library/src/main/res/drawable-xxhdpi/ic_launcher.png b/library/src/main/res/drawable-xxhdpi/ic_launcher.png
diff --git a/library/src/main/res/values/strings.xml b/library/src/main/res/values/strings.xml