Christian Schabesberger 338893ded4 fix merge conflict		2019-01-23 16:12:21 +01:00
..
assets	add themes to license dialog	2017-09-22 11:07:17 +02:00
java	fix merge conflict	2019-01-23 16:12:21 +01:00
res	fix merge conflict	2019-01-23 16:12:21 +01:00
AndroidManifest.xml	MP4 muxer +misc modifications	2019-01-22 18:53:31 -03:00
ic_settings_update_white-web.png	vector -> png	2018-11-26 01:18:02 +05:30