Merge branch 'branch-1.2' into debian

diff --git a/ChangeLog b/ChangeLog
index 9d470ebc136abc0f8117d7dcefc962d47e07deee..d70084ca822d81e3f9491c8d376a9336026756fd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+commit 6f51726b1c04940c5be3b6f320d6aa529afff9ca
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Tue May 21 09:28:53 2013 -0600
+
+    update configure.ac to reflect version 1.2.1
+
+commit 7699a55aed3a9a7daeb4c6a5a9a280f43edf455f
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Thu May 16 00:34:26 2013 -0600
+
+    update ChangeLog for release
+
 commit 116d8570766fbd3ef529111171935637a2e466af
 Author: Keith Packard <keithp@keithp.com>
 Date:   Tue May 14 08:51:22 2013 -0700

diff --git a/configure.ac b/configure.ac
index 32ab33a8f0f03f6c56d15aa40070265f84953822..fb095d5b38a92420ad531a47731c29a9ff623996 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([altos], 1.2)
+AC_INIT([altos], 1.2.1)
 AC_CONFIG_SRCDIR([src/core/ao.h])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE