Merge branch 'master' into root

Conflicts: AndroidManifest.xml libs/limelight-common.jar src/com/limelight/Game.java
2014-10-03 23:05:06 -07:00
parent 196c0e6cbc f56b7ff79e
commit cd4bf9a28b
5 changed files with 256 additions and 63 deletions
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="com.limelight.root"
    android:versionCode="35"
-    android:versionName="2.5.5.1" >
+    android:versionName="2.5.6" >

    <uses-sdk
        android:minSdkVersion="16"