[asterisk-commits] may: branch may/ooh323_ipv6_direct_rtp r307186 - in /team/may/ooh323_ipv6_dir...

[SVN commits to the Asterisk project]

Author: may
Date: Wed Feb  9 05:46:52 2011
New Revision: 307186

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=307186
Log:
reinit automerge

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

Propchange: team/may/ooh323_ipv6_direct_rtp/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/may/ooh323_ipv6_direct_rtp/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Propchange: team/may/ooh323_ipv6_direct_rtp/
            ('svn:mergeinfo' removed)

Propchange: team/may/ooh323_ipv6_direct_rtp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Feb  9 05:46:52 2011
@@ -1,1 +1,1 @@
-/trunk:1-306538
+/team/may/ooh323_ipv6:1-306970

Propchange: team/may/ooh323_ipv6_direct_rtp/cel/cel_odbc.c
            ('svn:mergeinfo' removed)

Propchange: team/may/ooh323_ipv6_direct_rtp/configs/cel_odbc.conf.sample
            ('svn:mergeinfo' removed)

Propchange: team/may/ooh323_ipv6_direct_rtp/sounds/Makefile
            ('svn:mergeinfo' removed)