[asterisk-commits] irroot: branch irroot/distrotech-customers-trunk r319364 - in /team/irroot/di...

[SVN commits to the Asterisk project]

Author: irroot
Date: Tue May 17 02:24:50 2011
New Revision: 319364

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=319364
Log:
Resolve conflicts

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

Propchange: team/irroot/distrotech-customers-trunk/cel/cel_odbc.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 17 02:24:50 2011
@@ -2,4 +2,4 @@
 /team/irroot/app_queue-trunk/cel/cel_odbc.c:318983-319002
 /team/irroot/distrotech-customers/cel/cel_odbc.c:318992-319000
 /team/irroot/distrotech-customers-1.8/cel/cel_odbc.c:319062,319075
-/team/irroot/t38gateway-trunk/cel/cel_odbc.c:318974-319016,319064,319067,319071
+/team/irroot/t38gateway-trunk/cel/cel_odbc.c:318974-319016,319064,319067,319071,319361

Propchange: team/irroot/distrotech-customers-trunk/configs/cel_odbc.conf.sample
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 17 02:24:50 2011
@@ -2,4 +2,4 @@
 /team/irroot/app_queue-trunk/configs/cel_odbc.conf.sample:318983-319002
 /team/irroot/distrotech-customers/configs/cel_odbc.conf.sample:318992-319000
 /team/irroot/distrotech-customers-1.8/configs/cel_odbc.conf.sample:319062,319075
-/team/irroot/t38gateway-trunk/configs/cel_odbc.conf.sample:318974-319016,319064,319067,319071
+/team/irroot/t38gateway-trunk/configs/cel_odbc.conf.sample:318974-319016,319064,319067,319071,319361

Propchange: team/irroot/distrotech-customers-trunk/sounds/Makefile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 17 02:24:50 2011
@@ -2,4 +2,4 @@
 /team/irroot/app_queue-trunk/sounds/Makefile:318983-319002
 /team/irroot/distrotech-customers/sounds/Makefile:318992-319000
 /team/irroot/distrotech-customers-1.8/sounds/Makefile:319062,319075
-/team/irroot/t38gateway-trunk/sounds/Makefile:318974-319016,319064,319067,319071
+/team/irroot/t38gateway-trunk/sounds/Makefile:318974-319016,319064,319067,319071,319361