Christian Schabesberger f451f1f65d resolve conflict

2018-01-20 18:06:34 +01:00

..

assets

add themes to license dialog

2017-09-22 11:07:17 +02:00

java

resolve conflict

2018-01-20 18:06:34 +01:00

res

resolve conflict

2018-01-20 18:06:34 +01:00

AndroidManifest.xml

-Fixed popup player not in foreground when opened by external intent.

2017-11-14 11:34:15 -08:00