1
0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-16 22:45:04 -05:00
Go to file
ashley willis a5d0e44711 Merge commit '4.113' into issue-162-new
Conflicts:
	src/com/fsck/k9/activity/ChooseFolder.java
	src/com/fsck/k9/controller/MessagingController.java
	src/com/fsck/k9/mail/store/ImapStore.java
	src/com/fsck/k9/view/MessageHeader.java

I hacked on src/com/fsck/k9/controller/MessagingController.java and perhaps broke uidplus support,
but things run fine in my simple tests.
2012-09-11 00:56:06 -05:00
assets Merge branch 'master' into issue549 2011-10-14 20:33:25 +02:00
compile-only-libs Add mockito jar for testing. 2011-07-21 17:41:19 -07:00
docs Added diagram that visualizes activity interactions 2011-10-27 19:13:13 +02:00
images Add vector graphic for "show more" indicator 2012-02-22 02:41:11 +01:00
libs Merge ashleywillis' changes in https://github.com/k9mail/k-9/pull/97. 2011-11-14 14:00:15 -08:00
res Merge commit '4.113' into issue-162-new 2012-09-11 00:56:06 -05:00
src/com/fsck/k9 Merge commit '4.113' into issue-162-new 2012-09-11 00:56:06 -05:00
tests Added some error checks when processing IMAP FETCH responses 2012-04-03 07:55:52 +02:00
tools Don't force Eclipse settings on users 2011-06-10 20:25:40 +02:00
.classpath ADT 17 changes 2012-03-25 00:28:40 +01:00
.gitignore Add vi archive files to default ignore list. 2011-08-29 12:07:19 -07:00
.project fix the eclipse project name 2010-11-26 03:53:18 +00:00
Android.mk Merge ashleywillis' changes in https://github.com/k9mail/k-9/pull/97. 2011-11-14 14:00:15 -08:00
AndroidManifest.xml Bumped manifest to 4.113 2012-04-03 09:33:22 -04:00
ant.properties Upgrade to SDK 15 2012-03-11 14:31:35 -05:00
build.xml added javadoc to build.xml. minor refactoring and reorganization of folder deletion and creation. 2012-01-27 18:38:29 -06:00
HTMLCLEANER_LICENSE Merge ashleywillis' changes in https://github.com/k9mail/k-9/pull/97. 2011-11-14 14:00:15 -08:00
k9mail.iml Commit a new default in IntelliJ IDE settings added by IntelliJ 11. 2012-01-07 09:36:07 -08:00
MODULE_LICENSE_APACHE2 Initial commit - This source code should be EXACTLY what the current version of the 'Email' application in the android repo looks like as of this date. 2008-10-28 01:04:44 +00:00
NOTICE Initial commit - This source code should be EXACTLY what the current version of the 'Email' application in the android repo looks like as of this date. 2008-10-28 01:04:44 +00:00
proguard.cfg Upgrade us to android-14 infrastructure 2011-10-27 12:41:24 -04:00
project.properties Upgrade to SDK 15 2012-03-07 21:52:47 +01:00