cketti 5f0f4e9c21 Merge pull request #485 from haselwarter ... Conflicts: src/com/fsck/k9/preferences/Settings.java		2014-09-04 23:55:30 +02:00
..
arrays.xml	Merge pull request #485 from haselwarter	2014-09-04 23:55:30 +02:00
attrs.xml
colors.xml
constants.xml
dimensions.xml
ids.xml
strings.xml	Merge pull request #485 from haselwarter	2014-09-04 23:55:30 +02:00
styles.xml
themes.xml	Merge pull request #492 from k9mail/remove_unused_resources	2014-09-04 17:01:28 -04:00