[asterisk-commits] may: branch may/ooh323_qsig r337956 - in /team/may/ooh323_qsig: ./ cel/ confi...

[SVN commits to the Asterisk project]

Author: may
Date: Fri Sep 23 19:28:42 2011
New Revision: 337956

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

........
  r336600 | qwell | 2011-09-19 20:22:52 +0400 (Mon, 19 Sep 2011) | 1 line
  
  Remove weird mergeinfo props that make merges annoying sometimes.
........

Modified:
    team/may/ooh323_qsig/   (props changed)
    team/may/ooh323_qsig/cel/cel_odbc.c   (props changed)
    team/may/ooh323_qsig/configs/cel_odbc.conf.sample   (props changed)
    team/may/ooh323_qsig/sounds/Makefile   (props changed)

Propchange: team/may/ooh323_qsig/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Sep 23 19:28:42 2011
@@ -1,1 +1,1 @@
-/trunk:1-336529
+/trunk:1-336529,336600

Propchange: team/may/ooh323_qsig/cel/cel_odbc.c
            ('svn:mergeinfo' removed)

Propchange: team/may/ooh323_qsig/configs/cel_odbc.conf.sample
            ('svn:mergeinfo' removed)

Propchange: team/may/ooh323_qsig/sounds/Makefile
            ('svn:mergeinfo' removed)