Merge branch 'branch-1.3' into debian

[fw/altos] / configure.ac

diff --git a/configure.ac b/configure.ac
index b92e06a9af6d5696b2864a077269379526bf0036..0b2960ce5fc0dd9a44481d4f21ac062b8d111399 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,11 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
+<<<<<<< HEAD
+AC_INIT([altos], 1.2.1)
+=======
 AC_INIT([altos], 1.3)
+>>>>>>> branch-1.3
 AC_CONFIG_SRCDIR([src/core/ao.h])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE