Updates

4 files changed, 24 insertions, 65 deletions

diff --git a/ChangeLog b/ChangeLog
index 1d8eea98c..184d3dac6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-22  Matthias Clasen  <mclasen@redhat.com>
+
+	* NEWS: Updates
+
 2006-07-21  Behdad Esfahbod  <behdad@gnome.org>
 
 	* glib/gmirroringtable.h: Updated to Unicode Character Database 5.0.0.
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 1d8eea98c..184d3dac6 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,7 @@
+2006-07-22  Matthias Clasen  <mclasen@redhat.com>
+
+	* NEWS: Updates
+
 2006-07-21  Behdad Esfahbod  <behdad@gnome.org>
 
 	* glib/gmirroringtable.h: Updated to Unicode Character Database 5.0.0.
diff --git a/NEWS b/NEWS
index c706d81a3..4dff73b9b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,19 @@
+Overview of Changes from GLib 2.12.0 to GLib 2.12.1
+===================================================
+
+* Update to final Unicode Character Database 5.0.0
+
+* Bugs fixed:
+ 346660 issues with base64 api documentation / g_base64_decode_cl...
+ 348136 Coverity reports allocation of wrong size CID #2839
+ 336281 Update to UCD 5.0
+ 346197 g_date_strftime %F option doesnt work for win32
+ 348011 Small optimization to real_toupper()
+
+* New and updated translations (bg,bn_IN,ca,dz,eu,fi,
+  fr,he,it,ja,mk,or,pt)
+
+
 Overview of Changes from GLib 2.11.4 to GLib 2.12
 =================================================
 
diff --git a/TODO.xml b/TODO.xml
deleted file mode 100644
index 940835ab9..000000000
--- a/TODO.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<!-- This is used to generate the online TODO list for glib using
-     the script gtk+/docs/make-todo. Whenever a change to this file is
-     committed to CVS,the file is run through make-todo and the online
-     version updated. If you modify this file, you should check for
-     parse errors by running:
-
-     $ ../gtk+/docs/make-todo TODO.xml > /dev/null
-
-     before committing, or you may screw up the online version --> 
-<todo logourl="gtk-logo-rgb.gif">
-  <title>GLib TODO list</title>
-  <section>
-    <title>GLib</title>
-
-    <entry size="medium" status="0%" target="1.4">
-      <title>Time type</title>
-      <description>
-	<p>
-          glib has a GDate class for calendrical calculations, but also needs a
-          way to deal with time. Fairly tricky to implement well.
-	</p>
-      </description>
-      <contact>gtk-devel-list@redhat.com</contact>
-    </entry>
-        
-    <entry size="small" status="80%" target="1.4">
-      <title>Regular expression support</title>
-      <description>
-	<p>
-          Someone (happybob?) wrote regexp support for glib. This needs to get a
-          final audit and then go in to the source tree.
-	</p>
-
-      </description>
-      <contact>gtk-devel-list@redhat.com</contact>
-    </entry>
-
-    <entry size="small" status="0%" target="1.4">
-      <title>Argument parsing</title>
-      <description>
-	<p>
-          Put support for command line argument parsing in glib. 
-          This should probably just be a renaming of popt. 
-          It's a larger task if you start from scratch.
-	</p>
-
-      </description>
-      <contact>gtk-devel-list@redhat.com</contact>
-    </entry>
-
-    <entry size="small" status="90%" target="1.4">
-      <title>Signal source for main loop</title>
-      <description>
-	<p>
-          Tim has a signal source for the main loop in bse, 
-          have to remember to get this in glib.
-	</p>
-
-      </description>
-      <contact>timj@gtk.org</contact>
-    </entry>
-
-
-  </section>
-</todo>