# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1177832440 0
# Node ID 8ef2d30bc1bfa3a3f1bd9123f78d1f5c5176b62c
# Parent  985bf8c7b8d11b52f1161beb74ce4fee177a31d5# Parent  a017913160cd5866c153712be0e6213565493039
merge of '7dbb9ed2994bf4252f9ae93a2eb6072800082022'
     and 'd03e6584d548b2fec6afd50eccf79344570173f3'

diff -r a017913160cd -r 8ef2d30bc1bf configure.ac
--- a/configure.ac	Sun Apr 29 07:38:49 2007 +0000
+++ b/configure.ac	Sun Apr 29 07:40:40 2007 +0000
@@ -11,10 +11,15 @@
 #   purple_micro_version = 0
 #   purple_major_version += 1;
 #
+# purple_version_suffix should be similar to one of the following:
+#   For beta releases:          [beta2]
+#   For code under development: [devel]
+#   For production releases:    []
+#
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [0])
 m4_define([purple_micro_version], [0])
-m4_define([purple_version_suffix], [devel])
+m4_define([purple_version_suffix], [beta7])
 m4_define([purple_version],
           [purple_major_version.purple_minor_version.purple_micro_version])
 m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suffix],[purple_version_suffix]))