qwell: branch asterisknow r1297 - /branches/asterisknow/

[SVN commits to the Asterisk-GUI project]

Author: qwell
Date: Thu Aug  2 12:26:39 2007
New Revision: 1297

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=1297
Log:
Switch to merge from 1.4 branch.

Modified:
    branches/asterisknow/   (props changed)

Propchange: branches/asterisknow/
------------------------------------------------------------------------------
--- svnmerge-blocked (original)
+++ svnmerge-blocked Thu Aug  2 12:26:39 2007
@@ -1,1 +1,1 @@
-/trunk:450-488,541,558,560,578-579,587
+/branches/1.4:

Propchange: branches/asterisknow/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Aug  2 12:26:39 2007
@@ -1,1 +1,1 @@
-/trunk:1-449,489-540,542-557,559,561-577,580-586,588-1291
+/branches/1.4:1-1296