[asterisk-commits] oej: branch oej/pinefrog-deluxe-rtcp-test r248183 - /team/oej/pinefrog-deluxe...

[SVN commits to the Asterisk project]

Author: oej
Date: Sun Feb 21 04:48:40 2010
New Revision: 248183

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=248183
Log:
Resetting conflict

Modified:
    team/oej/pinefrog-deluxe-rtcp-test/   (props changed)

Propchange: team/oej/pinefrog-deluxe-rtcp-test/
------------------------------------------------------------------------------
    automerge = http://www.codename-pineapple.org/

Propchange: team/oej/pinefrog-deluxe-rtcp-test/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Feb 21 04:48:40 2010
@@ -1,1 +1,1 @@
-/branches/1.4:1-248054
+/branches/1.4:1-248182