1
0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-10 11:35:11 -05:00
Go to file
cketti fc8d2e9979 Merge branch 'master' into issue549
Conflicts:
	res/menu/accounts_context.xml
	res/menu/accounts_option.xml
	res/values/strings.xml
	src/com/fsck/k9/Account.java
	src/com/fsck/k9/activity/Accounts.java
	src/com/fsck/k9/activity/AsyncUIProcessor.java
	src/com/fsck/k9/activity/FolderList.java
	src/com/fsck/k9/activity/ImportListener.java
	src/com/fsck/k9/activity/K9Activity.java
	src/com/fsck/k9/activity/K9ListActivity.java
	src/com/fsck/k9/activity/MessageView.java
	src/com/fsck/k9/mail/store/ImapStore.java
	src/com/fsck/k9/mail/store/Pop3Store.java
	src/com/fsck/k9/mail/store/WebDavStore.java
	src/com/fsck/k9/mail/transport/SmtpTransport.java
2011-10-14 20:33:25 +02: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 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
images Add button to allow editing of quoted message in HTML mode by dropping user back to text mode. Fixes issue 2959. 2011-02-05 15:14:02 -08:00
libs Replaced our local copy of jzlib with a clean jar built from jzlib 1.0.7 2011-01-31 18:26:01 +00:00
res Merge branch 'master' into issue549 2011-10-14 20:33:25 +02:00
src/com/fsck/k9 Merge branch 'master' into issue549 2011-10-14 20:33:25 +02:00
tests Use SDK 10 to build K-9 Mail since SDK 9 is no longer available. 2011-08-12 21:57:01 +02:00
tools Don't force Eclipse settings on users 2011-06-10 20:25:40 +02:00
.classpath Removed dependency on (external) commons-codec and commons-logging 2011-02-26 17:36:18 +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 added libraries to Android.mk 2011-05-05 21:24:39 +02:00
AndroidManifest.xml Merge branch 'master' into issue549 2011-10-14 20:33:25 +02:00
build.properties Bump us up to android-9 so we can have strict mode for development 2010-12-24 18:54:56 +00:00
build.xml Don't force Eclipse settings on users 2011-06-10 20:25:40 +02:00
default.properties Use SDK 10 to build K-9 Mail since SDK 9 is no longer available. 2011-08-12 21:57:01 +02:00
k9mail.iml Update .iml for IntelliJ IDEA 10.5 (Android SDK is now the platform SDK); remove unused compile only libs. 2011-05-24 12:43:32 -07: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