- Version 2.12.2YELP_2_12_2

* NEWS:
* configure.in:
- Version 2.12.2

3 files changed, 20 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index d6f42732..3c01a50d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+==================== 2.12.2 ====================
+
+2005-11-27  Shaun McCance  <shaunm@gnome.org>
+
+	* NEWS:
+	* configure.in:
+	- Version 2.12.2
+
 2005-11-07  Christian Persch  <chpe@cvs.gnome.org>
 
 	* configure.in:	Allow compilation against xulrunner.
diff --git a/NEWS b/NEWS
index b917ae1f..f24bed6b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+Changes in 2.12.2:
+------------------
+* Allow compilation against xulrunner (Robert O'Callahan)
+* Hide the bookmarks dialog on delete_event, #319502 (Brent Smith)
+* Fixed incorrect free, #319096 (Matthias Clasen)
+* Don't ship generated files (Frederic Crozat)
+* Hide the preferences dialog on delete_event, #318736 (Brent Smith)
+* Updated translations:
+  bn      (Khandakar Mujahidul Islam)
+  et      (Ivar Smolin)
+
 Changes in 2.12.1:
 ------------------
 * Updated translations:
diff --git a/configure.in b/configure.in
index 031eff63..bc0aef15 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT([yelp], [2.12.1],
+AC_INIT([yelp], [2.12.2],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=yelp])
 
 GNOME_COMMON_INIT