Christian Schabesberger a3468b51e2 Merge branch 'pfix' into dev		2018-02-21 23:00:56 +01:00
..
assets	add themes to license dialog	2017-09-22 11:07:17 +02:00
java	Merge branch 'pfix' into dev	2018-02-21 23:00:56 +01:00
res	Merge branch 'pfix' into dev	2018-02-21 23:00:56 +01:00
AndroidManifest.xml	merge RouterActivity and RouterVideoActivity	2018-02-12 23:07:17 +01:00