Cameron Gutman 1965cc2347 Merge branch 'NewUI-prepare-for-translation' into NewUI ...

Conflicts:
	app/src/main/java/com/limelight/PcView.java

2014-11-13 21:30:11 -08:00

..

libs

New common with disabled FEC

2014-11-13 21:16:32 -08:00

src

Merge branch 'NewUI-prepare-for-translation' into NewUI

2014-11-13 21:30:11 -08:00

app.iml

Update to support GFE 2.1.4

2014-11-10 22:01:19 -08:00

build.gradle

Update beta version

2014-11-10 22:06:02 -08:00