gnutrition-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUtrition-commits] /srv/bzr/gnutrition/trunk r4: Merging development v

From: Thomas Sinclair
Subject: [GNUtrition-commits] /srv/bzr/gnutrition/trunk r4: Merging development version 0.33.0 with trunk
Date: Thu, 26 Jul 2012 22:01:13 -0400
User-agent: Bazaar (2.5.0) 
------------------------------------------------------------
revno: 4
committer: Thomas Sinclair <address@hidden>
branch nick: trunk
timestamp: Thu 2012-07-26 22:01:13 -0400
message:
  Merging development version 0.33.0 with trunk
modified:
  configure.in

=== modified file 'configure.in'
--- a/configure.in      2012-05-28 00:06:39 +0000
+++ b/configure.in      2012-07-27 02:01:13 +0000
@@ -23,11 +23,8 @@
 AC_SUBST(PACKAGE)
 
 MAJOR_VERSION=0
-<<<<<<< TREE
 MINOR_VERSION=31.2
 VERSION="0.31.2"
-=======
->>>>>>> MERGE-SOURCE
 AC_SUBST(MAJOR_VERSION)
 AC_SUBST(MINOR_VERSION)
 AC_SUBST(VERSION)
reply via email to
[Prev in Thread] Current Thread [Next in Thread]