nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
geary/src/engine
History
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
..
abstract Merge branch 'master' into feature/search 2013-06-24 17:54:41 -07:00
api Merge branch 'master' into feature/search 2013-06-24 17:54:41 -07:00
common Merge branch 'master' into feature/search 2013-06-24 17:54:41 -07:00
db Command continuation and synchronizing literals: Closes #3737 2013-06-24 16:46:37 -07:00
imap Command continuation and synchronizing literals: Closes #3737 2013-06-24 16:46:37 -07:00
imap-db Merge branch 'master' into feature/search 2013-06-24 17:54:41 -07:00
imap-engine Merge branch 'master' into feature/search 2013-06-24 17:54:41 -07:00
memory Command continuation and synchronizing literals: Closes #3737 2013-06-24 16:46:37 -07:00
nonblocking Merge branch 'master' into feature/search 2013-06-14 15:50:20 -07:00
rfc822 Merge branch 'master' into feature/search 2013-06-24 17:54:41 -07:00
smtp Command continuation and synchronizing literals: Closes #3737 2013-06-24 16:46:37 -07:00
state Update copyright headers; fix #6195 2013-04-12 12:32:39 -07:00
util Merge branch 'master' into feature/search 2013-06-24 17:54:41 -07:00