Merge branch 'master' into root

Browse Source

Conflicts:
	AndroidManifest.xml
	libs/limelight-common.jar
	res/values/strings.xml

...

This commit is contained in:

Cameron Gutman

2014-10-17 13:55:45 -07:00

parent 8efe194682 b492ac43f8

commit a18aa51f5a

92 changed files with 417 additions and 273 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.