Cameron Gutman 274e0d0557 Merge branch 'master' into virtualcontroller_master ...

Conflicts:
	app/app.iml
	app/build.gradle
	app/libs/limelight-common.jar
	app/src/main/java/com/limelight/Game.java
	app/src/main/java/com/limelight/binding/input/ControllerHandler.java
	app/src/main/java/com/limelight/binding/video/MediaCodecHelper.java
	app/src/main/java/com/limelight/computers/ComputerDatabaseManager.java
	app/src/main/java/com/limelight/preferences/PreferenceConfiguration.java
	app/src/main/jni/evdev_reader/evdev_reader.c
	app/src/main/res/xml/preferences.xml
	limelight-android.iml
	limelight_vc.iml
	moonlight-android.iml

2016-01-07 00:01:03 -06:00

..

libs

Update common with timeouts for RTSP handshake

2016-01-06 13:08:18 -06:00

src

Merge branch 'master' into virtualcontroller_master

2016-01-07 00:01:03 -06:00

app.iml

improve virtual controller:

2016-01-03 11:12:43 +01:00

build.gradle

Update version for 4.0.3 r2

2016-01-04 09:30:56 -06:00