root: branch group/asterisknow-mergetest r1528 - /team/group/asterisknow-merg...

[SVN commits to the Asterisk-GUI project]

Author: root
Date: Wed Sep  5 15:03:07 2007
New Revision: 1528

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=1528
Log:
automerge commit

Modified:
    team/group/asterisknow-mergetest/   (props changed)
    team/group/asterisknow-mergetest/Makefile

Propchange: team/group/asterisknow-mergetest/
------------------------------------------------------------------------------
--- asterisknow-integrated (original)
+++ asterisknow-integrated Wed Sep  5 15:03:07 2007
@@ -1,1 +1,1 @@
-/branches/asterisknow:1-1523
+/branches/asterisknow:1-1527

Modified: team/group/asterisknow-mergetest/Makefile
URL: http://svn.digium.com/view/asterisk-gui/team/group/asterisknow-mergetest/Makefile?view=diff&rev=1528&r1=1527&r2=1528
==============================================================================
--- team/group/asterisknow-mergetest/Makefile (original)
+++ team/group/asterisknow-mergetest/Makefile Wed Sep  5 15:03:07 2007
@@ -3,7 +3,7 @@
 #
 # Top level Makefile
 #
-# Copyright (C) 1999-2006, Digium, Inc.
+# Copyright (C) 1999-2007, Digium, Inc.
 #
 # Mark Spencer <markster at digium.com>
 #