diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index b92e06a9..0b2960ce 100644 --- 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 |