Merge branch 'master' into root

Browse Source

Conflicts:
	AndroidManifest.xml
	src/com/limelight/binding/input/evdev/EvdevWatcher.java

...

This commit is contained in:

Cameron Gutman

2014-09-20 02:54:15 -07:00

parent 9d4ca6293f 0517e8a530

commit 1b026f1354

7 changed files with 148 additions and 156 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/jcodec-0.1.5.jar Normal file

Binary file not shown.

BIN

libs/limelight-common.jar

Binary file not shown.