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

[SVN commits to the Asterisk project]

Author: irroot
Date: Sat Jun  4 08:00:03 2011
New Revision: 322011

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

Modified:
    team/irroot/distrotech-customers-trunk/   (props changed)
    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/configure
    team/irroot/distrotech-customers-trunk/sounds/Makefile   (props changed)

Propchange: team/irroot/distrotech-customers-trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun  4 08:00:03 2011
@@ -1,1 +1,1 @@
-/trunk:319002-321991
+/trunk:319002-322010

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

Propchange: team/irroot/distrotech-customers-trunk/cel/cel_odbc.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun  4 08:00:03 2011
@@ -3,4 +3,4 @@
 /team/irroot/distrotech-customers/cel/cel_odbc.c:318992-319000
 /team/irroot/distrotech-customers-1.8/cel/cel_odbc.c:319062,319075,321526,321549-321550
 /team/irroot/t38gateway-trunk/cel/cel_odbc.c:318974-319016,319064,319067,319071,319361,320879-321541
-/trunk/cel/cel_odbc.c:319002-321991
+/trunk/cel/cel_odbc.c:319002-322010

Propchange: team/irroot/distrotech-customers-trunk/configs/cel_odbc.conf.sample
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun  4 08:00:03 2011
@@ -3,4 +3,4 @@
 /team/irroot/distrotech-customers/configs/cel_odbc.conf.sample:318992-319000
 /team/irroot/distrotech-customers-1.8/configs/cel_odbc.conf.sample:319062,319075,321526,321549-321550
 /team/irroot/t38gateway-trunk/configs/cel_odbc.conf.sample:318974-319016,319064,319067,319071,319361,320879-321541
-/trunk/configs/cel_odbc.conf.sample:319002-321991
+/trunk/configs/cel_odbc.conf.sample:319002-322010

Propchange: team/irroot/distrotech-customers-trunk/sounds/Makefile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun  4 08:00:03 2011
@@ -3,4 +3,4 @@
 /team/irroot/distrotech-customers/sounds/Makefile:318992-319000
 /team/irroot/distrotech-customers-1.8/sounds/Makefile:319062,319075,321526,321549-321550
 /team/irroot/t38gateway-trunk/sounds/Makefile:318974-319016,319064,319067,319071,319361,320879-321541
-/trunk/sounds/Makefile:319002-321991
+/trunk/sounds/Makefile:319002-322010