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

parent 5606ed1308 92f24d20db

commit d199c1b6c4

4 changed files with 2 additions and 4 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

app/libs/limelight-common.jar

Binary file not shown.