[asterisk-commits] irroot: branch irroot/distrotech-customers-1.8 r322009 - in /team/irroot/dist...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Sat Jun 4 07:56:34 CDT 2011
Author: irroot
Date: Sat Jun 4 07:56:30 2011
New Revision: 322009
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=322009
Log:
Resolve Conflicts / Merge
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/configure
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)
team/irroot/distrotech-customers-1.8/sounds/Makefile (props changed)
Propchange: team/irroot/distrotech-customers-1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun 4 07:56:30 2011
@@ -1,1 +1,1 @@
-/branches/1.8:318982-321986
+/branches/1.8:318982-322006
Propchange: team/irroot/distrotech-customers-1.8/
('svnmerge-integrated' removed)
Propchange: team/irroot/distrotech-customers-1.8/cel/cel_odbc.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun 4 07:56:30 2011
@@ -1,5 +1,5 @@
/be/branches/C.3/cel/cel_adaptive_odbc.c:256426
-/branches/1.8/cel/cel_odbc.c:318982-321986
+/branches/1.8/cel/cel_odbc.c:318982-322006
/team/irroot/distrotech-customers-1.8/cel/cel_odbc.c:319067
/team/irroot/distrotech-customers-trunk/cel/cel_odbc.c:320619,320821-320822,321099,321552
/team/irroot/t38gateway-1.8/cel/cel_odbc.c:318979-319017,319357,321514
Propchange: team/irroot/distrotech-customers-1.8/configs/cel_odbc.conf.sample
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun 4 07:56:30 2011
@@ -1,5 +1,5 @@
/be/branches/C.3/configs/cel_adaptive_odbc.conf.sample:256426
-/branches/1.8/configs/cel_odbc.conf.sample:318982-321986
+/branches/1.8/configs/cel_odbc.conf.sample:318982-322006
/team/irroot/distrotech-customers-1.8/configs/cel_odbc.conf.sample:319067
/team/irroot/distrotech-customers-trunk/configs/cel_odbc.conf.sample:320619,320821-320822,321099,321552
/team/irroot/t38gateway-1.8/configs/cel_odbc.conf.sample:318979-319017,319357,321514
Propchange: team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/iaxfriends.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun 4 07:56:30 2011
@@ -1,4 +1,4 @@
-/branches/1.8/contrib/realtime/mysql/iaxfriends.sql:318982-321986
+/branches/1.8/contrib/realtime/mysql/iaxfriends.sql:318982-322006
/team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/iaxfriends.sql:319067
/team/irroot/distrotech-customers-trunk/contrib/realtime/mysql/iaxfriends.sql:320619,320821-320822,321099,321552
/team/irroot/t38gateway-1.8/contrib/realtime/mysql/iaxfriends.sql:318979-319017,319357,321514
Propchange: team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/meetme.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun 4 07:56:30 2011
@@ -1,4 +1,4 @@
-/branches/1.8/contrib/realtime/mysql/meetme.sql:318982-321986
+/branches/1.8/contrib/realtime/mysql/meetme.sql:318982-322006
/team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/meetme.sql:319067
/team/irroot/distrotech-customers-trunk/contrib/realtime/mysql/meetme.sql:320619,320821-320822,321099,321552
/team/irroot/t38gateway-1.8/contrib/realtime/mysql/meetme.sql:318979-319017,319357,321514
Propchange: team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/sipfriends.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun 4 07:56:30 2011
@@ -1,4 +1,4 @@
-/branches/1.8/contrib/realtime/mysql/sipfriends.sql:318982-321986
+/branches/1.8/contrib/realtime/mysql/sipfriends.sql:318982-322006
/team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/sipfriends.sql:319067
/team/irroot/distrotech-customers-trunk/contrib/realtime/mysql/sipfriends.sql:320619,320821-320822,321099,321552
/team/irroot/t38gateway-1.8/contrib/realtime/mysql/sipfriends.sql:318979-319017,319357,321514
Propchange: team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/voicemail.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun 4 07:56:30 2011
@@ -1,4 +1,4 @@
-/branches/1.8/contrib/realtime/mysql/voicemail.sql:318982-321986
+/branches/1.8/contrib/realtime/mysql/voicemail.sql:318982-322006
/team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/voicemail.sql:319067
/team/irroot/distrotech-customers-trunk/contrib/realtime/mysql/voicemail.sql:320619,320821-320822,321099,321552
/team/irroot/t38gateway-1.8/contrib/realtime/mysql/voicemail.sql:318979-319017,319357,321514
Propchange: team/irroot/distrotech-customers-1.8/contrib/realtime/postgresql/realtime.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun 4 07:56:30 2011
@@ -1,4 +1,4 @@
-/branches/1.8/contrib/realtime/postgresql/realtime.sql:318982-321986
+/branches/1.8/contrib/realtime/postgresql/realtime.sql:318982-322006
/team/irroot/distrotech-customers-1.8/contrib/realtime/postgresql/realtime.sql:319067
/team/irroot/distrotech-customers-trunk/contrib/realtime/postgresql/realtime.sql:320619,320821-320822,321099,321552
/team/irroot/t38gateway-1.8/contrib/realtime/postgresql/realtime.sql:318979-319017,319357,321514
Propchange: team/irroot/distrotech-customers-1.8/sounds/Makefile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun 4 07:56:30 2011
@@ -1,2 +1,2 @@
-/branches/1.8/sounds/Makefile:318982-321986
+/branches/1.8/sounds/Makefile:318982-322006
/team/irroot/t38gateway-trunk/sounds/Makefile:320880-321512,321514-321541
More information about the asterisk-commits
mailing list