Merge branch 'master' into root

Browse Source

Conflicts:
	AndroidManifest.xml
	libs/limelight-common.jar
	src/com/limelight/Game.java

...

This commit is contained in:

Cameron Gutman

2014-10-03 23:05:06 -07:00

parent 196c0e6cbc f56b7ff79e

commit cd4bf9a28b

5 changed files with 256 additions and 63 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

libs/limelight-common.jar

Binary file not shown.