[asterisk-commits] irroot: branch irroot/t38gateway-trunk r322010 - in /team/irroot/t38gateway-t...

[SVN commits to the Asterisk project]

Author: irroot
Date: Sat Jun  4 07:58:31 2011
New Revision: 322010

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=322010
Log:
Resolve Conflicts / Merge

Modified:
    team/irroot/t38gateway-trunk/   (props changed)
    team/irroot/t38gateway-trunk/cel/cel_odbc.c   (props changed)
    team/irroot/t38gateway-trunk/configs/cel_odbc.conf.sample   (props changed)
    team/irroot/t38gateway-trunk/sounds/Makefile   (props changed)

Propchange: team/irroot/t38gateway-trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun  4 07:58:31 2011
@@ -1,1 +1,1 @@
-/trunk:318974-322004
+/trunk:318974-322006

Propchange: team/irroot/t38gateway-trunk/
            ('svnmerge-integrated' removed)

Propchange: team/irroot/t38gateway-trunk/cel/cel_odbc.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun  4 07:58:31 2011
@@ -1,4 +1,4 @@
 /be/branches/C.3/cel/cel_adaptive_odbc.c:256426
 /team/irroot/distrotech-customers-1.8/cel/cel_odbc.c:319062
 /team/irroot/distrotech-customers-trunk/cel/cel_odbc.c:320771
-/trunk/cel/cel_odbc.c:318974-322004
+/trunk/cel/cel_odbc.c:318974-322006

Propchange: team/irroot/t38gateway-trunk/configs/cel_odbc.conf.sample
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun  4 07:58:31 2011
@@ -1,4 +1,4 @@
 /be/branches/C.3/configs/cel_adaptive_odbc.conf.sample:256426
 /team/irroot/distrotech-customers-1.8/configs/cel_odbc.conf.sample:319062
 /team/irroot/distrotech-customers-trunk/configs/cel_odbc.conf.sample:320771
-/trunk/configs/cel_odbc.conf.sample:318974-322004
+/trunk/configs/cel_odbc.conf.sample:318974-322006

Propchange: team/irroot/t38gateway-trunk/sounds/Makefile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun  4 07:58:31 2011
@@ -1,4 +1,4 @@
 /be/branches/C.3/sounds/Makefile:256426
 /team/irroot/distrotech-customers-1.8/sounds/Makefile:319062
 /team/irroot/distrotech-customers-trunk/sounds/Makefile:320771
-/trunk/sounds/Makefile:270974,318974-322004
+/trunk/sounds/Makefile:270974,318974-322006