diff options
| author | Bdale Garbee <bdale@gag.com> | 2013-05-21 09:30:43 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2013-05-21 09:30:43 -0600 |
| commit | 97b80e3fef28d367a5ed1d18893accd1416cdf3f (patch) | |
| tree | a40afb3264d79d231a8356af5d3f61444c6c80e0 | |
| parent | 7b4e5943c4d8da20e6bfcc6517749108e88aa7a5 (diff) | |
| parent | 9b138221283f0b8e8df5a799f75d73fd456028a0 (diff) | |
Merge branch 'branch-1.2' into debian
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 13 insertions, 1 deletions
@@ -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 32ab33a8..fb095d5b 100644 --- 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 |