[svn-commits] seanbright: branch 1.6.0 r139918 - in /branches/1.6.0: ./ build_tools/

[SVN commits to the Digium repositories]

Author: seanbright
Date: Mon Aug 25 16:33:21 2008
New Revision: 139918

URL: http://svn.digium.com/view/asterisk?view=rev&rev=139918
Log:
Merged revisions 139915 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r139915 | seanbright | 2008-08-25 17:32:10 -0400 (Mon, 25 Aug 2008) | 17 lines

Merged revisions 139909 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139909 | seanbright | 2008-08-25 17:31:03 -0400 (Mon, 25 Aug 2008) | 9 lines

Some versions of awk (nawk, for example) don't like empty regular expressions
so be slightly more verbose.

(closes issue #13374)
Reported by: dougm
Patches:
      13374.diff uploaded by seanbright (license 71)
Tested by: dougm

........

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/build_tools/get_makeopts
    branches/1.6.0/build_tools/get_moduleinfo

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/build_tools/get_makeopts
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/build_tools/get_makeopts?view=diff&rev=139918&r1=139917&r2=139918
==============================================================================
--- branches/1.6.0/build_tools/get_makeopts (original)
+++ branches/1.6.0/build_tools/get_makeopts Mon Aug 25 16:33:21 2008
@@ -1,3 +1,3 @@
 /\/\*\*\* MAKEOPTS/ {printit=1; next}
 /\*\*\*\// {if (printit) exit}
-// {if (printit) print}
+/.*/ {if (printit) print}

Modified: branches/1.6.0/build_tools/get_moduleinfo
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/build_tools/get_moduleinfo?view=diff&rev=139918&r1=139917&r2=139918
==============================================================================
--- branches/1.6.0/build_tools/get_moduleinfo (original)
+++ branches/1.6.0/build_tools/get_moduleinfo Mon Aug 25 16:33:21 2008
@@ -1,3 +1,3 @@
 /\/\*\*\* MODULEINFO/ {printit=1; next}
 /\*\*\*\// {if (printit) exit}
-// {if (printit) print}
+/.*/ {if (printit) print}