[asterisk-commits] seanbright: branch seanbright/resolve-shadow-warnings r114301 - in /team/sean...

[SVN commits to the Asterisk project]

Author: seanbright
Date: Sat Apr 19 10:26:46 2008
New Revision: 114301

URL: http://svn.digium.com/view/asterisk?view=rev&rev=114301
Log:
Merged revisions 114295,114298,114300 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r114295 | seanbright | 2008-04-18 20:15:31 -0400 (Fri, 18 Apr 2008) | 2 lines

Ignore refcounter

................
r114298 | tilghman | 2008-04-19 09:53:38 -0400 (Sat, 19 Apr 2008) | 11 lines

Blocked revisions 114297 via svnmerge

........
r114297 | tilghman | 2008-04-19 08:49:50 -0500 (Sat, 19 Apr 2008) | 4 lines

MOH usage information needs a terminating newline, or else
"asterisk -rx 'help moh reload'" will hang.  Reported via
-dev list, fixed by me.

........

................
r114300 | tilghman | 2008-04-19 09:58:56 -0400 (Sat, 19 Apr 2008) | 9 lines

Blocked revisions 114299 via svnmerge

........
r114299 | tilghman | 2008-04-19 08:57:17 -0500 (Sat, 19 Apr 2008) | 2 lines

Ensure that help text terminates with a newline

........

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

Modified:
    team/seanbright/resolve-shadow-warnings/   (props changed)
    team/seanbright/resolve-shadow-warnings/utils/   (props changed)

Propchange: team/seanbright/resolve-shadow-warnings/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.

Propchange: team/seanbright/resolve-shadow-warnings/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Apr 19 10:26:46 2008
@@ -1,1 +1,1 @@
-/trunk:1-114288
+/trunk:1-114300

Propchange: team/seanbright/resolve-shadow-warnings/utils/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Apr 19 10:26:46 2008
@@ -25,3 +25,4 @@
 threadstorage.c
 utils.c
 astcanary
+refcounter