Cameron Gutman 51c85a1b10 Merge branch 'master' into 4k ...

Conflicts:
	app/libs/limelight-common.jar

2015-10-31 16:46:46 -07:00

..

libs

Merge branch 'master' into 4k

2015-10-31 16:46:46 -07:00

src

Use setFixedSize if aspect ratios are compatible. This seems necessary for 4K video.

2015-10-31 16:25:15 -07:00

app.iml

Update IML file

2015-10-11 17:11:08 -07:00

build.gradle

Update version to 3.5-beta1

2015-10-23 14:47:35 -07:00