diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 0 insertions, 5 deletions
@@ -4163,7 +4163,6 @@ Date: Wed May 15 01:24:56 2013 -0700 altos: Add flash-loader for telescience-v0.2 Signed-off-by: Keith Packard <keithp@keithp.com> ->>>>>>> branch-1.3 commit 116d8570766fbd3ef529111171935637a2e466af Author: Keith Packard <keithp@keithp.com> diff --git a/configure.ac b/configure.ac index 0b2960ce..b92e06a9 100644 --- a/configure.ac +++ b/configure.ac @@ -18,11 +18,7 @@ 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 |