[asterisk-commits] oej: branch oej/pinerana-lock-mwipvt-trunk r335318 - in /team/oej/pinerana-lo...

[SVN commits to the Asterisk project]

Author: oej
Date: Mon Sep 12 06:32:48 2011
New Revision: 335318

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=335318
Log:
Updating

Modified:
    team/oej/pinerana-lock-mwipvt-trunk/   (props changed)
    team/oej/pinerana-lock-mwipvt-trunk/cel/cel_odbc.c   (props changed)
    team/oej/pinerana-lock-mwipvt-trunk/configs/cel_odbc.conf.sample   (props changed)
    team/oej/pinerana-lock-mwipvt-trunk/sounds/Makefile   (props changed)

Propchange: team/oej/pinerana-lock-mwipvt-trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 12 06:32:48 2011
@@ -1,1 +1,1 @@
-/trunk:332448-335212
+/trunk:332448-335212,335261

Propchange: team/oej/pinerana-lock-mwipvt-trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Sep 12 06:32:48 2011
@@ -1,1 +1,1 @@
-/trunk:1-335301
+/trunk:1-335298

Propchange: team/oej/pinerana-lock-mwipvt-trunk/cel/cel_odbc.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 12 06:32:48 2011
@@ -1,2 +1,2 @@
 /be/branches/C.3/cel/cel_adaptive_odbc.c:256426
-/trunk/cel/cel_odbc.c:332448-335212
+/trunk/cel/cel_odbc.c:332448-335212,335261

Propchange: team/oej/pinerana-lock-mwipvt-trunk/configs/cel_odbc.conf.sample
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 12 06:32:48 2011
@@ -1,2 +1,2 @@
 /be/branches/C.3/configs/cel_adaptive_odbc.conf.sample:256426
-/trunk/configs/cel_odbc.conf.sample:332448-335212
+/trunk/configs/cel_odbc.conf.sample:332448-335212,335261

Propchange: team/oej/pinerana-lock-mwipvt-trunk/sounds/Makefile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 12 06:32:48 2011
@@ -1,2 +1,2 @@
 /be/branches/C.3/sounds/Makefile:256426
-/trunk/sounds/Makefile:270974,332448-335212
+/trunk/sounds/Makefile:270974,332448-335212,335261