aboutsummaryrefslogtreecommitdiffstats
path: root/macros
diff options
context:
space:
mode:
authorMartin Baulig <martin@src.gnome.org>1999-02-28 19:26:02 +0800
committerMartin Baulig <martin@src.gnome.org>1999-02-28 19:26:02 +0800
commit3567dff72453d676f086cbab86d396f84ff9ea24 (patch)
tree552b657e984e360faf9acd940cab1c982c2a0692 /macros
parent43a26581b2bcf303134d67fa61f7edc04ce55bcd (diff)
downloadgsoc2013-evolution-3567dff72453d676f086cbab86d396f84ff9ea24.tar
gsoc2013-evolution-3567dff72453d676f086cbab86d396f84ff9ea24.tar.gz
gsoc2013-evolution-3567dff72453d676f086cbab86d396f84ff9ea24.tar.bz2
gsoc2013-evolution-3567dff72453d676f086cbab86d396f84ff9ea24.tar.lz
gsoc2013-evolution-3567dff72453d676f086cbab86d396f84ff9ea24.tar.xz
gsoc2013-evolution-3567dff72453d676f086cbab86d396f84ff9ea24.tar.zst
gsoc2013-evolution-3567dff72453d676f086cbab86d396f84ff9ea24.zip
Remove a CVS conflict marker.
svn path=/trunk/; revision=709
Diffstat (limited to 'macros')
-rw-r--r--macros/ChangeLog2
1 files changed, 1 insertions, 1 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog
index 886fb07b5a..cbeb877758 100644
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -2,6 +2,7 @@
* gnome-x-checks.m4 : Require at least gtk+ 1.2 (pointless getting
bug reports with an old glib/gtk/gdk set..)
+
1999-02-25 Martin Baulig <martin@home-of-linux.org>
* gnome-libgtop-checks.m4: Require LibGTop >= 1.0.0.
@@ -94,7 +95,6 @@ Tue Feb 16 19:35:42 1999 Owen Taylor <otaylor@redhat.com>
* need-declaration.m4, gnome-support.m4: Fixed the scandir detection.
->>>>>>> 1.149
1998-12-22 Jeff Garzik <jgarzik@pobox.com>
* gnome.m4: Added and exported GNOME_APPLET_LIBS.