Merge branch 'v2.5'

Conflicts:
	libs/limelight-common.jar
This commit is contained in:
Cameron Gutman
2014-07-03 16:30:10 -07:00
10 changed files with 264 additions and 67 deletions

View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.limelight"
android:versionCode="18"
android:versionName="2.4" >
android:versionCode="19"
android:versionName="2.5 (alpha)" >
<uses-sdk
android:minSdkVersion="16"