summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2012-04-04 15:58:56 -0400
committerJonny Lamb <jonny.lamb@collabora.co.uk>2012-04-04 15:58:56 -0400
commitec9c21b47860fb75cd7a13fe57b9ed44be4a451d (patch)
tree68e9867fd88f5969bbb3139cdd58e4d4a05364ac
parentf1613a45ff8ac54f3a42f11ed323a9ee2007c2c0 (diff)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
-rw-r--r--NEWS2
-rw-r--r--configure.ac4
2 files changed, 3 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 3d70a0d..b408440 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-telepathy-haze 0.6.0 (UNRELEASED)
+telepathy-haze 0.6.0 (2012-04-04)
=================================
This is the start of a new stable branch.
diff --git a/configure.ac b/configure.ac
index c751e5f..3aa4af5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,9 +7,9 @@ AC_PREREQ([2.59])
# set nano_version to 1
m4_define([haze_major_version], [0])
-m4_define([haze_minor_version], [5])
+m4_define([haze_minor_version], [6])
m4_define([haze_micro_version], [0])
-m4_define([haze_nano_version], [1])
+m4_define([haze_nano_version], [0])
m4_define([haze_base_version],
[haze_major_version.haze_minor_version.haze_micro_version])