summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--NEWS18
-rw-r--r--configure.ac2
3 files changed, 24 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8ed3da83..b337c78e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2009-09-08 Jonathon Jongsma <jonathon.jongsma@collabora.co.uk>
+ * NEWS: update for release
+ * configure.ac: increment version to 2.21.5
+
+2009-09-08 Jonathon Jongsma <jonathon.jongsma@collabora.co.uk>
+
* gio/src/filelist.am: disable network IO stuff for now since it's
too close to the stable release and we don't want to have unfinished
API that isn't well-tested.
diff --git a/NEWS b/NEWS
index f6dc069c..9d8b1fab 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,21 @@
+2.21.5 (unstable):
+
+ This release is a release candidate for 2.22.0. As such, some unfinished
+ API has been disabled (notably the network IO classes that we were not able
+ to finish in time). Also, a few documentation-related fixes.
+
+ Daniel Elstner (5):
+ Remove sigc from the Doxygen excluded symbols
+ Sanitize the Glib::Cond usage example
+ Officially deprecate GLIBMM_CHECK_PERL macro
+ Delete obsolete MAINTAINERS file
+ Implement Gio::Socket ctors using Gio::Initable
+
+ Jonathon Jongsma (2):
+ Add Network I/O classes to new documentation module
+ disable network io stuff. punt to next release
+
+
2.21.4.2 (unstable):
This release corrects a mistake in the build setup which prevented
diff --git a/configure.ac b/configure.ac
index ba276221..f9975435 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
## You should have received a copy of the GNU Lesser General Public License
## along with this library. If not, see <http://www.gnu.org/licenses/>.
-AC_INIT([glibmm], [2.21.4.2], [http://bugzilla.gnome.org/enter_bug.cgi?product=glibmm],
+AC_INIT([glibmm], [2.21.5], [http://bugzilla.gnome.org/enter_bug.cgi?product=glibmm],
[glibmm], [http://www.gtkmm.org/])
AC_PREREQ([2.59])