From: Ken Rice <krice@freeswitch.org>
Date: Thu, 9 Oct 2014 15:55:28 +0000 (-0500)
Subject: Prep for v1.4.10, update version numbers in configure.ac and
X-Git-Tag: v1.4.10~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4ef985bf5e36d256078176472a799ac825b570e;p=thirdparty%2Ffreeswitch.git

Prep for v1.4.10, update version numbers in configure.ac and
Merge branch 'master' into v1.4

Conflicts:
	configure.ac
---

a4ef985bf5e36d256078176472a799ac825b570e
diff --cc configure.ac
index 7cd2efd248,696a7f4554..7ae8101072
--- a/configure.ac
+++ b/configure.ac
@@@ -3,10 -3,10 +3,10 @@@
  
  # Must change all of the below together
  # For a release, set revision for that tagged release as well and uncomment
- AC_INIT([freeswitch], [1.4.9], bugs@freeswitch.org)
 -AC_INIT([freeswitch], [1.5.15b], bugs@freeswitch.org)
++AC_INIT([freeswitch], [1.4.10], bugs@freeswitch.org)
  AC_SUBST(SWITCH_VERSION_MAJOR, [1])
 -AC_SUBST(SWITCH_VERSION_MINOR, [5])
 -AC_SUBST(SWITCH_VERSION_MICRO, [15b])
 +AC_SUBST(SWITCH_VERSION_MINOR, [4])
- AC_SUBST(SWITCH_VERSION_MICRO, [9])
++AC_SUBST(SWITCH_VERSION_MICRO, [10])
  AC_SUBST(SWITCH_VERSION_REVISION, [])
  AC_SUBST(SWITCH_VERSION_REVISION_HUMAN, [])