Merged revisions 50228 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Wed, 10 Jan 2007 02:19:47 +0000 (02:19 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 10 Jan 2007 02:19:47 +0000 (02:19 +0000)
commit79756a9d6af2b40d2bd1e3b15b0442e190586d82
tree693af5d1b4acb2b57070d9b023e797efaf8a6200
parent0b3cd06c4a61fc8e6d1f188185df7691cb534a72
Merged revisions 50228 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r50228 | russell | 2007-01-09 21:17:46 -0500 (Tue, 09 Jan 2007) | 14 lines

Merged revisions 50227 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r50227 | russell | 2007-01-09 21:16:45 -0500 (Tue, 09 Jan 2007) | 6 lines

Make the number that represents the major version number a single digit instead
of 2.  Using two digits makes it an octal number when put into version.h, which
breaks the compilation of any out of tree module that checks the version for
any version after 1.2.7 (reported by Matteo Brancaleoni on the asterisk-dev
mailing list, who gave credit to vihai for pointing it out)

........

................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@50229 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Makefile