Merge branch 'master' into 4k

Conflicts:
	app/build.gradle
	app/libs/limelight-common.jar
This commit is contained in:
Cameron Gutman committed 2015-11-11 17:36:08 -08:00
commit d199c1b6c4
4 files changed
+2 -4

No files matched your search

+1 -1
View File
@@ -12,7 +12,7 @@ android {
targetSdkVersion 23
versionName "3.5-beta4"
versionCode = 71
versionCode = 73
}
productFlavors {