Charles Lindsay fca993fec7 Merge branch 'master' into feature/search ... Conflicts: sql/version-010.sql src/client/folder-list/folder-list-folder-entry.vala src/engine/rfc822/rfc822-message.vala Also, I had to manually fix some compile errors introduced due to interfaces changing on master.		2013-06-24 17:54:41 -07:00
..
accelerators.ui	Closes #6199 Ctrl-F text search in current conversation	2013-05-07 13:59:54 -07:00
account_cannot_remove.glade	Closes #6334 Show and set "From:" field in composer	2013-02-08 11:59:27 -08:00
account_list.glade	Closes #6759 New edit icon in account dialog	2013-06-19 19:06:16 -07:00
account_spinner.glade	Closes #6201 First batch of work for account manager. "Add account" functionality is complete (though Geary will still only display one email account in the main UI)	2013-01-22 18:23:07 -08:00
CMakeLists.txt	Closes #6199 Ctrl-F text search in current conversation	2013-05-07 13:59:54 -07:00
composer.glade	Add formatting menu in composer; fix #6436	2013-04-30 17:20:13 -07:00
composer_accelerators.ui	Add formatting menu in composer; fix #6436	2013-04-30 17:20:13 -07:00
find_bar.glade	Closes #6919 Find toolbar mnemonics	2013-05-28 11:45:24 -07:00
login.glade	Closes #6361 Alt-S now saves edits in accounts	2013-04-09 17:27:18 -07:00
message.glade	HTML support via WebKitGtk. Closes #3709	2012-01-20 17:31:56 -08:00
password-dialog.glade	Closes #5893 Password dialog enhancements	2013-01-22 18:00:40 -08:00
preferences.glade	Missing keyboard mnemonics in Preferences dialog: Closes #5618	2012-08-30 17:39:24 -07:00
remove_confirm.glade	Closes #6286 Delete accounts	2013-02-04 19:26:48 -08:00
toolbar.glade	Closes #6963 Search upgrade progress bar	2013-06-03 17:39:42 -07:00
toolbar_mark_menu.ui	Closes #4647 Closes #5685 Spam/unspam	2013-02-21 14:57:59 -08:00
toolbar_menu.ui	Closes #6201 First batch of work for account manager. "Add account" functionality is complete (though Geary will still only display one email account in the main UI)	2013-01-22 18:23:07 -08:00