[asterisk-commits] irroot: branch irroot/t38gateway-1.8 r322007 - in /team/irroot/t38gateway-1.8...

[SVN commits to the Asterisk project]

Author: irroot
Date: Sat Jun  4 07:53:27 2011
New Revision: 322007

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

Modified:
    team/irroot/t38gateway-1.8/   (props changed)
    team/irroot/t38gateway-1.8/cel/cel_odbc.c   (props changed)
    team/irroot/t38gateway-1.8/configs/cel_odbc.conf.sample   (props changed)
    team/irroot/t38gateway-1.8/configure
    team/irroot/t38gateway-1.8/contrib/realtime/mysql/iaxfriends.sql   (props changed)
    team/irroot/t38gateway-1.8/contrib/realtime/mysql/meetme.sql   (props changed)
    team/irroot/t38gateway-1.8/contrib/realtime/mysql/sipfriends.sql   (props changed)
    team/irroot/t38gateway-1.8/contrib/realtime/mysql/voicemail.sql   (props changed)
    team/irroot/t38gateway-1.8/contrib/realtime/postgresql/realtime.sql   (props changed)
    team/irroot/t38gateway-1.8/sounds/Makefile   (props changed)

Propchange: team/irroot/t38gateway-1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun  4 07:53:27 2011
@@ -1,1 +1,1 @@
-/branches/1.8:318979-321991
+/branches/1.8:318979-322006

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

Propchange: team/irroot/t38gateway-1.8/cel/cel_odbc.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun  4 07:53:27 2011
@@ -1,5 +1,5 @@
 /be/branches/C.3/cel/cel_adaptive_odbc.c:256426
-/branches/1.8/cel/cel_odbc.c:318979-321991
+/branches/1.8/cel/cel_odbc.c:318979-322006
 /team/irroot/distrotech-customers-1.8/cel/cel_odbc.c:319062-319063,321553
 /team/irroot/distrotech-customers-trunk/cel/cel_odbc.c:321552
 /team/irroot/t38gateway-trunk/cel/cel_odbc.c:318977-319016,319067,319070-319071,320879-321512,321514-321541

Propchange: team/irroot/t38gateway-1.8/configs/cel_odbc.conf.sample
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun  4 07:53:27 2011
@@ -1,5 +1,5 @@
 /be/branches/C.3/configs/cel_adaptive_odbc.conf.sample:256426
-/branches/1.8/configs/cel_odbc.conf.sample:318979-321991
+/branches/1.8/configs/cel_odbc.conf.sample:318979-322006
 /team/irroot/distrotech-customers-1.8/configs/cel_odbc.conf.sample:319062-319063,321553
 /team/irroot/distrotech-customers-trunk/configs/cel_odbc.conf.sample:321552
 /team/irroot/t38gateway-trunk/configs/cel_odbc.conf.sample:318977-319016,319067,319070-319071,320879-321512,321514-321541

Propchange: team/irroot/t38gateway-1.8/contrib/realtime/mysql/iaxfriends.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun  4 07:53:27 2011
@@ -1,4 +1,4 @@
-/branches/1.8/contrib/realtime/mysql/iaxfriends.sql:318979-321991
+/branches/1.8/contrib/realtime/mysql/iaxfriends.sql:318979-322006
 /team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/iaxfriends.sql:319062-319063,321553
 /team/irroot/distrotech-customers-trunk/contrib/realtime/mysql/iaxfriends.sql:321552
 /team/irroot/t38gateway-trunk/contrib/realtime/mysql/iaxfriends.sql:318977-319016,319067,319070-319071,320879

Propchange: team/irroot/t38gateway-1.8/contrib/realtime/mysql/meetme.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun  4 07:53:27 2011
@@ -1,4 +1,4 @@
-/branches/1.8/contrib/realtime/mysql/meetme.sql:318979-321991
+/branches/1.8/contrib/realtime/mysql/meetme.sql:318979-322006
 /team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/meetme.sql:319062-319063,321553
 /team/irroot/distrotech-customers-trunk/contrib/realtime/mysql/meetme.sql:321552
 /team/irroot/t38gateway-trunk/contrib/realtime/mysql/meetme.sql:318977-319016,319067,319070-319071,320879

Propchange: team/irroot/t38gateway-1.8/contrib/realtime/mysql/sipfriends.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun  4 07:53:27 2011
@@ -1,4 +1,4 @@
-/branches/1.8/contrib/realtime/mysql/sipfriends.sql:318979-321991
+/branches/1.8/contrib/realtime/mysql/sipfriends.sql:318979-322006
 /team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/sipfriends.sql:319062-319063,321553
 /team/irroot/distrotech-customers-trunk/contrib/realtime/mysql/sipfriends.sql:321552
 /team/irroot/t38gateway-trunk/contrib/realtime/mysql/sipfriends.sql:318977-319016,319067,319070-319071,320879

Propchange: team/irroot/t38gateway-1.8/contrib/realtime/mysql/voicemail.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun  4 07:53:27 2011
@@ -1,4 +1,4 @@
-/branches/1.8/contrib/realtime/mysql/voicemail.sql:318979-321991
+/branches/1.8/contrib/realtime/mysql/voicemail.sql:318979-322006
 /team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/voicemail.sql:319062-319063,321553
 /team/irroot/distrotech-customers-trunk/contrib/realtime/mysql/voicemail.sql:321552
 /team/irroot/t38gateway-trunk/contrib/realtime/mysql/voicemail.sql:318977-319016,319067,319070-319071,320879

Propchange: team/irroot/t38gateway-1.8/contrib/realtime/postgresql/realtime.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun  4 07:53:27 2011
@@ -1,4 +1,4 @@
-/branches/1.8/contrib/realtime/postgresql/realtime.sql:318979-321991
+/branches/1.8/contrib/realtime/postgresql/realtime.sql:318979-322006
 /team/irroot/distrotech-customers-1.8/contrib/realtime/postgresql/realtime.sql:319062-319063,321553
 /team/irroot/distrotech-customers-trunk/contrib/realtime/postgresql/realtime.sql:321552
 /team/irroot/t38gateway-trunk/contrib/realtime/postgresql/realtime.sql:318977-319016,319067,319070-319071,320879

Propchange: team/irroot/t38gateway-1.8/sounds/Makefile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun  4 07:53:27 2011
@@ -1,5 +1,5 @@
 /be/branches/C.3/sounds/Makefile:256426
-/branches/1.8/sounds/Makefile:318979-321991
+/branches/1.8/sounds/Makefile:318979-322006
 /team/irroot/distrotech-customers-1.8/sounds/Makefile:319062-319063,321553
 /team/irroot/distrotech-customers-trunk/sounds/Makefile:321552
 /team/irroot/t38gateway-trunk/sounds/Makefile:318977-319016,319067,319070-319071,320879-321512,321514-321541