summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrent Smith <bmsmith@src.gnome.org>2006-06-12 23:03:16 +0000
committerBrent Smith <bmsmith@src.gnome.org>2006-06-12 23:03:16 +0000
commit1f7d1be8d6f32cac072878d44a0ea652bcc034e2 (patch)
tree222e98ead271a5ec4478b1fb035c3c5a4d92e2f6
parentd1db1fd18cd65a85f79677cdc135f4cf6a17b7a7 (diff)
downloadshared-mime-info-1f7d1be8d6f32cac072878d44a0ea652bcc034e2.tar.gz
Merged bug-buddy-xmlrpc branch to HEAD using the following commands on a
Merged bug-buddy-xmlrpc branch to HEAD using the following commands on a fresh checkout of HEAD: cvs update -j HEAD -j BUG_BUDDY_2_13_0 cvs update -j BUG_BUDDY_2_13_0 -j bug-buddy-xmlrpc cvs update -C po/* svn path=/trunk/; revision=3795
-rw-r--r--macros/ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog
index a25f59c3..d6a6d610 100644
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,3 +1,7 @@
+==================== 2.12.0 ====================
+
+==================== 2.11.92 ====================
+
2005-02-18 Stepan Kasal <kasal@ucw.cz>
* macros/autogen.sh: Fix the URL for Automake; don't recommend 1.3