moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2025-07-20 11:33:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 4k

Browse Source 
Conflicts:
	app/build.gradle
	app/libs/limelight-common.jar
This commit is contained in:
Cameron Gutman 2015-11-11 17:36:08 -08:00
commit d199c1b6c4
4 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

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

BIN
app/libs/limelight-common.jar
View File

Binary file not shown.

1
app/src/main/AndroidManifest.xml
View File

@ -11,6 +11,7 @@
<uses-feature android:name="android.hardware.touchscreen" android:required="false" /> <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
<uses-feature android:name="android.hardware.wifi" android:required="false" /> <uses-feature android:name="android.hardware.wifi" android:required="false" />
<uses-feature android:name="android.hardware.gamepad" android:required="false" /> <uses-feature android:name="android.hardware.gamepad" android:required="false" />
<uses-feature android:name="android.hardware.usb.host" android:required="false" />
<application <application
android:allowBackup="true" android:allowBackup="true"

3
app/src/root/AndroidManifest.xml
View File

@ -1,9 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"> <manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Root permissions -->
<uses-permission android:name="android.permission.ACCESS_SUPERUSER" />
<!-- Root application name --> <!-- Root application name -->
<application android:label="Moonlight (Root)" /> <application android:label="Moonlight (Root)" />
</manifest> </manifest>