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 · 4030a36 · 4030a36
11 parents cd5dffb + 5d7867c + 1f8bc83 + c5ab2f3 + 7a52da4 + bb2812c + f7972b4 + 0abbe02 + aefc063 + b47bdc4 + 179da8c
commit 4030a36
Show file tree

Hide file tree

Showing 12 changed files with 0 additions and 12 deletions.
diff --git a/src/AbstractAdapter.php b/src/AbstractAdapter.php
@@ -38,7 +38,6 @@
  * @subpackage Adapter
  * @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$
  */
 abstract class AbstractAdapter extends \Zend\Validator\AbstractValidator implements Adapter
 {

diff --git a/src/Adapter.php b/src/Adapter.php
@@ -35,7 +35,6 @@
  * @subpackage Adapter
  * @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$
  */
 interface Adapter extends \Zend\Validator\Validator
 {

diff --git a/src/Dumb.php b/src/Dumb.php
@@ -35,7 +35,6 @@
  * @subpackage Adapter
  * @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$
 */
 class Dumb extends Word
 {

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

diff --git a/src/Figlet.php b/src/Figlet.php
@@ -36,7 +36,6 @@
  * @subpackage Adapter
  * @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$
  */
 class Figlet extends Word
 {

diff --git a/src/Image.php b/src/Image.php
@@ -17,7 +17,6 @@
  * @subpackage Adapter
  * @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/ReCaptcha.php b/src/ReCaptcha.php
@@ -40,7 +40,6 @@
  * @subpackage Adapter
  * @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$
  */
 class ReCaptcha extends AbstractAdapter
 {

diff --git a/src/Word.php b/src/Word.php
@@ -36,7 +36,6 @@
  * @subpackage Adapter
  * @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$
  */
 abstract class Word extends AbstractAdapter
 {

diff --git a/test/DumbTest.php b/test/DumbTest.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/FigletTest.php b/test/FigletTest.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/ImageTest.php b/test/ImageTest.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/ReCaptchaTest.php b/test/ReCaptchaTest.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$
  */
 
 /**