[asterisk-commits] russell: trunk r328877 - /trunk/

[SVN commits to the Asterisk project]

Author: russell
Date: Tue Jul 19 16:21:53 2011
New Revision: 328877

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=328877
Log:
Fix properties after twilson's change so merges still work

Modified:
    trunk/   (props changed)

Propchange: trunk/
            ('branch-1.10-blocked' removed)

Propchange: trunk/
            ('branch-1.10-merged' removed)

Propchange: trunk/
------------------------------------------------------------------------------
    branch-2.0-blocked = /branches/1.10:

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-2.0-merged (added)
+++ branch-2.0-merged Tue Jul 19 16:21:53 2011
@@ -1,0 +1,1 @@
+/branches/1.10:1-328075,328120,328162,328207,328247,328317,328329,328428-328429,328448,328451,328541,328609,328611,328664,328717,328771,328824