cketti 2b7f5e7b70 Merge branch 'pick_attachment_fix' ... Update LocalStore code to handle the newly introduced temporary files for attachments Conflicts: res/values/strings.xml src/com/fsck/k9/activity/MessageCompose.java		2013-09-25 05:22:00 +02:00
..
arrays.xml	Add Slovak to the list of supported languages	2013-07-11 02:49:42 +02:00
attrs.xml	Add icon for the copy action	2013-08-29 20:54:36 +02:00
colors.xml	merge date and time font size preference into one	2013-02-11 13:05:52 +01:00
constants.xml	Extracted some strings to constants.xml	2012-04-23 15:05:29 +00:00
dimensions.xml	Imported a variant of http://code.google.com/p/android-color-picker/ into k-9	2010-11-08 02:21:32 +00:00
ids.xml	Issue 2296 Spam message	2011-04-01 05:54:51 +08:00
strings.xml	Merge branch 'pick_attachment_fix'	2013-09-25 05:22:00 +02:00
styles.xml	Change appearance of unread widget	2013-03-16 01:57:21 +01:00
themes.xml	Add icon for the copy action	2013-08-29 20:54:36 +02:00