Merge branch 'zf2/master' into milestones/autoloading

- Bring milestones/autoloading branch up-to-date with current master Conflicts: library/Zend/Loader/Autoloader.php library/Zend/Loader/PluginLoader.php library/Zend/Serializer/Serializer.php library/Zend/View/AbstractView.php library/Zend/View/View.php library/Zend/View/ViewEngine.php tests/Zend/Loader/AutoloaderTest.php tests/Zend/View/ViewTest.php
zendframework · Oct 28, 2010 · adf1f8e · adf1f8e
2 parents f2cd1bc + fcc9172
commit adf1f8e
Show file tree

Hide file tree

Showing 16 changed files with 0 additions and 16 deletions.
diff --git a/src/AbstractPage.php b/src/AbstractPage.php
@@ -16,7 +16,6 @@
  * @package   Zend_Navigation
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Container.php b/src/Container.php
@@ -16,7 +16,6 @@
  * @package   Zend_Navigation
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Exception.php b/src/Exception.php
@@ -16,7 +16,6 @@
  * @package   Zend_Navigation
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Navigation.php b/src/Navigation.php
@@ -16,7 +16,6 @@
  * @package   Zend_Navigation
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Page/Mvc.php b/src/Page/Mvc.php
@@ -17,7 +17,6 @@
  * @subpackage Page
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Page/Uri.php b/src/Page/Uri.php
@@ -17,7 +17,6 @@
  * @subpackage Page
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/ContainerTest.php b/test/ContainerTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/NavigationTest.php b/test/NavigationTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
  */
 
 /**

diff --git a/test/Page/MvcTest.php b/test/Page/MvcTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/Page/UriTest.php b/test/Page/UriTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/PageFactoryTest.php b/test/PageFactoryTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/PageTest.php b/test/PageTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/TestAsset/Container.php b/test/TestAsset/Container.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/TestAsset/InvalidPage.php b/test/TestAsset/InvalidPage.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/TestAsset/Page.php b/test/TestAsset/Page.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/TestAsset/UrlHelper.php b/test/TestAsset/UrlHelper.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**