LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed merge

Browse source 
Monotone-Parent: 89c8046bde59d4d200a7f039c310086919d53cfd
Monotone-Revision: 9e0909dcbb77a5837442df736d80607b0a3fb383

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-07-20T18:23:33
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte 2012-07-20 18:23:33 +00:00
parent 368b07d36e
commit fdec2c5d7b
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -1,4 +1,3 @@
<<<<<<< variant A
2012-07-20 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/MailerUI.js (onEmailTo): append the email
@ -81,7 +80,6 @@
(-save): don t swap the bytes of the version number as it would
return a wrong change number and a wrong change key for DB objects.
>>>>>>> variant B
2012-07-20 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/NSObject+MAPIStore.m (-getSMTPAddrType:inMemCtx:):