Christian Schabesberger c8d94f541f resolved merge conflict		2016-01-05 21:50:25 +01:00
..
colors.xml	update resources names to match naming convention & cleanup & start working on themes	2016-01-05 22:56:40 +03:00
dimens.xml	fix layout issues & update screenshots	2015-12-15 13:45:59 +03:00
settings_keys.xml	update resources names to match naming convention & cleanup & start working on themes	2016-01-05 22:56:40 +03:00
strings.xml	resolved merge conflict	2016-01-05 21:50:25 +01:00
styles.xml	update resources names to match naming convention & cleanup & start working on themes	2016-01-05 22:56:40 +03:00