[asterisk-commits] irroot: branch irroot/distrotech-customers-1.8 r319360 - in /team/irroot/dist...

[SVN commits to the Asterisk project]

Author: irroot
Date: Tue May 17 01:56:47 2011
New Revision: 319360

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=319360
Log:
Conflicts Resolved

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

Propchange: team/irroot/distrotech-customers-1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 17 01:56:47 2011
@@ -1,4 +1,4 @@
 /be/branches/C.3:256426
 /team/irroot/distrotech-customers-1.8:319067
-/team/irroot/t38gateway-1.8:318979-319017
+/team/irroot/t38gateway-1.8:318979-319017,319357
 /team/irroot/t38gateway-trunk:318977-319016,319067,319071

Propchange: team/irroot/distrotech-customers-1.8/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue May 17 01:56:47 2011
@@ -1,1 +1,1 @@
-/branches/1.8:1-319273
+/branches/1.8:1-319211

Propchange: team/irroot/distrotech-customers-1.8/cel/cel_odbc.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 17 01:56:47 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:319067
-/team/irroot/t38gateway-1.8/cel/cel_odbc.c:318979-319017
+/team/irroot/t38gateway-1.8/cel/cel_odbc.c:318979-319017,319357
 /team/irroot/t38gateway-trunk/cel/cel_odbc.c:318977-319016,319067,319071

Propchange: team/irroot/distrotech-customers-1.8/configs/cel_odbc.conf.sample
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 17 01:56:47 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:319067
-/team/irroot/t38gateway-1.8/configs/cel_odbc.conf.sample:318979-319017
+/team/irroot/t38gateway-1.8/configs/cel_odbc.conf.sample:318979-319017,319357
 /team/irroot/t38gateway-trunk/configs/cel_odbc.conf.sample:318977-319016,319067,319071

Propchange: team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/iaxfriends.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 17 01:56:47 2011
@@ -1,3 +1,3 @@
 /team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/iaxfriends.sql:319067
-/team/irroot/t38gateway-1.8/contrib/realtime/mysql/iaxfriends.sql:318979-319017
+/team/irroot/t38gateway-1.8/contrib/realtime/mysql/iaxfriends.sql:318979-319017,319357
 /team/irroot/t38gateway-trunk/contrib/realtime/mysql/iaxfriends.sql:318977-319016,319067,319071

Propchange: team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/meetme.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 17 01:56:47 2011
@@ -1,3 +1,3 @@
 /team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/meetme.sql:319067
-/team/irroot/t38gateway-1.8/contrib/realtime/mysql/meetme.sql:318979-319017
+/team/irroot/t38gateway-1.8/contrib/realtime/mysql/meetme.sql:318979-319017,319357
 /team/irroot/t38gateway-trunk/contrib/realtime/mysql/meetme.sql:318977-319016,319067,319071

Propchange: team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/sipfriends.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 17 01:56:47 2011
@@ -1,3 +1,3 @@
 /team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/sipfriends.sql:319067
-/team/irroot/t38gateway-1.8/contrib/realtime/mysql/sipfriends.sql:318979-319017
+/team/irroot/t38gateway-1.8/contrib/realtime/mysql/sipfriends.sql:318979-319017,319357
 /team/irroot/t38gateway-trunk/contrib/realtime/mysql/sipfriends.sql:318977-319016,319067,319071

Propchange: team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/voicemail.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 17 01:56:47 2011
@@ -1,3 +1,3 @@
 /team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/voicemail.sql:319067
-/team/irroot/t38gateway-1.8/contrib/realtime/mysql/voicemail.sql:318979-319017
+/team/irroot/t38gateway-1.8/contrib/realtime/mysql/voicemail.sql:318979-319017,319357
 /team/irroot/t38gateway-trunk/contrib/realtime/mysql/voicemail.sql:318977-319016,319067,319071

Propchange: team/irroot/distrotech-customers-1.8/contrib/realtime/postgresql/realtime.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 17 01:56:47 2011
@@ -1,3 +1,3 @@
 /team/irroot/distrotech-customers-1.8/contrib/realtime/postgresql/realtime.sql:319067
-/team/irroot/t38gateway-1.8/contrib/realtime/postgresql/realtime.sql:318979-319017
+/team/irroot/t38gateway-1.8/contrib/realtime/postgresql/realtime.sql:318979-319017,319357
 /team/irroot/t38gateway-trunk/contrib/realtime/postgresql/realtime.sql:318977-319016,319067,319071