From b957556a9cd08cef7257585aa0ccf975d59ef949 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Thu, 16 Jul 2009 02:18:24 +0000 Subject: [PATCH] Merged Monotone-Parent: 3765f757435c9d9934d42b1af5d1fd32fe72631a Monotone-Revision: 94da50397e51ef2f1bf7530b7a3c4b2e9e1594f6 Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2009-07-16T02:18:24 Monotone-Branch: ca.inverse.sogo --- NEWS | 7 ------- 1 file changed, 7 deletions(-) diff --git a/NEWS b/NEWS index 6cfbc7602..2ef45455d 100644 --- a/NEWS +++ b/NEWS @@ -1,15 +1,8 @@ -<<<<<<< variant A 1.0-2009mmdd (1.0.4) -------------------- - added contextual menu in web calendar views - ->>>>>>> variant B -1.0-2009XXXX (1.0.4) --------------------- - added "Reload" button to refresh the current view in the calendar -####### Ancestor -======= end 1.0-20090714 (1.0.3) -------------------- - improved search behavior of users folders (UIxContactsUserFolders)