[asterisk-commits] kpfleming: trunk r328880 - /trunk/

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Tue Jul 19 16:32:35 2011
New Revision: 328880

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=328880
Log:
Edit the merge properties to match their names.


Modified:
    trunk/   (props changed)

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-2.0-blocked (original)
+++ branch-2.0-blocked Tue Jul 19 16:32:35 2011
@@ -1,1 +1,1 @@
-/branches/1.10:
+/branches/2.0:

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