ashley willis fe0088bed3 Merge commit '4.118' into issue-162-new ... Conflicts: src/com/fsck/k9/K9.java trivial conflict. removed duplicate javadoc entry in build.xml		2012-09-11 01:24:11 -05:00
..
activity	Merge commit '4.118' into issue-162-new	2012-09-11 01:24:11 -05:00
controller	Merge commit '4.118' into issue-162-new	2012-09-11 01:24:11 -05:00
crypto	added comments, reworked a bit, and created warning dialog if some recipients don't have keys saved.	2011-11-21 01:59:51 -06:00
helper	Always use the application context when instantiating singletons	2012-05-16 22:22:39 +02:00
mail	Merge commit '4.118' into issue-162-new	2012-09-11 01:24:11 -05:00
preferences	Merge commit '4.118' into issue-162-new	2012-09-11 01:24:11 -05:00
provider	Upgrade to SDK 15	2012-03-07 21:52:47 +01:00
remotecontrol	astyle-d	2011-02-26 18:39:06 -06:00
service	Changed internal representation of the selected theme in the database	2012-03-29 06:33:01 +02:00
view	Merge commit '4.116' into issue-162-new	2012-09-11 01:20:38 -05:00
Account.java	Merge commit '4.116' into issue-162-new	2012-09-11 01:20:38 -05:00
AccountStats.java	Grey out unavailable accounts.	2011-03-19 12:36:58 -05:00
BaseAccount.java	astyle-d	2011-02-26 18:39:06 -06:00
EmailAddressAdapter.java	Don't use EmailAddressAdapter as singleton	2012-04-11 03:26:45 +02:00
EmailAddressValidator.java	astyle-d	2011-02-26 18:39:06 -06:00
EmailReceivedIntent.java	astyle-d	2011-02-26 18:39:06 -06:00
FontSizes.java	Changed font size unit from DIP to SP	2012-01-12 02:18:41 +01:00
Identity.java	astyle-d	2011-02-26 18:39:06 -06:00
K9.java	Merge commit '4.118' into issue-162-new	2012-09-11 01:24:11 -05:00
NotificationSetting.java	astyle-d	2011-02-26 18:39:06 -06:00
Preferences.java	Always use the application context when instantiating singletons	2012-05-16 22:22:39 +02:00
SearchAccount.java	Deduplicated code to create SearchAccounts for special accounts	2012-02-29 03:03:20 +01:00
SearchSpecification.java	astyle-d	2011-02-26 18:39:06 -06:00