Merge branch 'dev'

# Conflicts: # README.md
Doikki · May 19, 2017 · 2549a16 · 2549a16
2 parents de5bf05 + 5fd6e25
commit 2549a16
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -15,5 +15,11 @@ Step 1.Add it in your root build.gradle at the end of repositories:
 Step 2. Add the dependency
 
 	dependencies {
-	        compile 'com.github.DevlinChiu:MagicPlayer:1.0'
+	        compile 'com.github.DevlinChiu:MagicPlayer:1.0.1'
 	}
+### ProGuard
+
+	-keep class tv.danmaku.ijk.** { *; }
+    -dontwarn tv.danmaku.ijk.**
+    -keep class com.devlin_n.magic_player.** { *; }
+    -dontwarn com.devlin_n.magic_player.**