[asterisk-commits] irroot: branch irroot/app_queue_skill r325613 - in /team/irroot/app_queue_ski...

[SVN commits to the Asterisk project]

Author: irroot
Date: Wed Jun 29 13:12:56 2011
New Revision: 325613

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=325613
Log:
Resolved Conflicts Introduced with r324364

Modified:
    team/irroot/app_queue_skill/   (props changed)
    team/irroot/app_queue_skill/cel/cel_odbc.c   (props changed)
    team/irroot/app_queue_skill/configs/cel_odbc.conf.sample   (props changed)
    team/irroot/app_queue_skill/sounds/Makefile   (props changed)

Propchange: team/irroot/app_queue_skill/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/irroot/app_queue_skill/
            ('svn:mergeinfo' removed)

Propchange: team/irroot/app_queue_skill/
------------------------------------------------------------------------------
    svnmerge-integrated = /trunk:1-325554

Propchange: team/irroot/app_queue_skill/cel/cel_odbc.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 29 13:12:56 2011
@@ -1,2 +1,1 @@
 /be/branches/C.3/cel/cel_adaptive_odbc.c:256426
-/trunk/cel/cel_odbc.c:322065-325597

Propchange: team/irroot/app_queue_skill/configs/cel_odbc.conf.sample
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 29 13:12:56 2011
@@ -1,2 +1,1 @@
 /be/branches/C.3/configs/cel_adaptive_odbc.conf.sample:256426
-/trunk/configs/cel_odbc.conf.sample:322065-325597

Propchange: team/irroot/app_queue_skill/sounds/Makefile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 29 13:12:56 2011
@@ -1,2 +1,2 @@
 /be/branches/C.3/sounds/Makefile:256426
-/trunk/sounds/Makefile:270974,322065-325597
+/trunk/sounds/Makefile:270974