qwell: trunk r3598 - /trunk/

[SVN commits to the Asterisk-GUI project]

Author: qwell
Date: Fri Aug  1 15:34:14 2008
New Revision: 3598

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=3598
Log:
Switch to branch-1.4-merged and branch-1.4-blocked properties.  You must now add '-P branch-1.4-merged -B branch-1.4-blocked' to the svnmerge command.

Modified:
    trunk/   (props changed)

Propchange: trunk/
------------------------------------------------------------------------------
    branch-1.4-blocked = /branches/1.4:

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: trunk/
            ('svnmerge-blocked' removed)

Propchange: trunk/
            ('svnmerge-integrated' removed)