aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/ChangeLog
diff options
context:
space:
mode:
authorChenthill Palanisamy <pchen@src.gnome.org>2006-07-10 18:42:58 +0800
committerChenthill Palanisamy <pchen@src.gnome.org>2006-07-10 18:42:58 +0800
commit79e662f99e144d6ad8d14d720315f131325ee2ae (patch)
tree29ad10dff71d302fe8709a8f1e1f373eacd4512d /calendar/ChangeLog
parent24b40b9a896d39e08abf8fdb6f89bf0534c559ea (diff)
downloadgsoc2013-evolution-79e662f99e144d6ad8d14d720315f131325ee2ae.tar
gsoc2013-evolution-79e662f99e144d6ad8d14d720315f131325ee2ae.tar.gz
gsoc2013-evolution-79e662f99e144d6ad8d14d720315f131325ee2ae.tar.bz2
gsoc2013-evolution-79e662f99e144d6ad8d14d720315f131325ee2ae.tar.lz
gsoc2013-evolution-79e662f99e144d6ad8d14d720315f131325ee2ae.tar.xz
gsoc2013-evolution-79e662f99e144d6ad8d14d720315f131325ee2ae.tar.zst
gsoc2013-evolution-79e662f99e144d6ad8d14d720315f131325ee2ae.zip
Fixes #332911
svn path=/trunk/; revision=32268
Diffstat (limited to 'calendar/ChangeLog')
-rw-r--r--calendar/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 973136dba8..49f7b11489 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -38,7 +38,6 @@
(alarm_to_malarm_widgets); (populate_widgets_from_alarm):
Handle mail alarm.
->>>>>>> 1.3068
2006-06-30 Johnny Jacob <jjohnny@novell.com>
* gui/cal-search-bar.c: (get_current_category),
(get_category_sexp), (notify_e_cal_view_contains),