Adrian Ulrich 4f6a507b6c Merge branch 'master' into lp-design ...

Conflicts:
	res/values/theme.xml

2015-04-05 21:27:58 +02:00

..

dslv_attrs.xml

Import DSLV

2014-10-17 11:40:09 +02:00

theme.xml

Merge branch 'master' into lp-design

2015-04-05 21:27:58 +02:00

translatable.xml

implement "play next"

2015-02-15 18:07:34 +01:00

untranslatable.xml

split up untranslatable.xml

2015-03-29 14:50:55 +02:00