Cameron Gutman 1965cc2347 Merge branch 'NewUI-prepare-for-translation' into NewUI ...

Conflicts:
	app/src/main/java/com/limelight/PcView.java

2014-11-13 21:30:11 -08:00

..

java/com/limelight

Merge branch 'NewUI-prepare-for-translation' into NewUI

2014-11-13 21:30:11 -08:00

jni

Fix warning in JNI code

2014-10-29 23:57:11 -07:00

res

Merge branch 'NewUI-prepare-for-translation' into NewUI

2014-11-13 21:30:11 -08:00

AndroidManifest.xml

Fix full-screen theme

2014-11-02 13:41:35 -08:00