Fixed some merge issues

Author: Gabriel Bull

Classes/PHPWord.php

@@ -20,7 +20,7 @@
  *
  * @category   PHPWord
  * @package    PHPWord
- * @copyright  Copyright (c) 2013 PHPWord (http://www.codeplex.com/PHPWord)
+ * @copyright  Copyright (c) 2013 PHPWord
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
  * @version    0.7.0
  */

Classes/PHPWord/Autoloader.php

@@ -20,14 +20,13 @@
  *
  * @category   PHPWord
  * @package    PHPWord
- * @copyright  Copyright (c) 2013 PHPWord (http://www.codeplex.com/PHPWord)
+ * @copyright  Copyright (c) 2013 PHPWord
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
  * @version    0.7.0
  */
 
-
 /**
- * PHPWord_DocumentProperties
+ * Class PHPWord_DocumentProperties
  */
 class PHPWord_DocumentProperties
 {

Classes/PHPWord/DocumentProperties.php

@@ -20,33 +20,30 @@
  *
  * @category   PHPWord
  * @package    PHPWord
- * @copyright  Copyright (c) 2009 - 2010 PHPWord (http://www.codeplex.com/PHPWord)
+ * @copyright  Copyright (c) 2013 PHPWord
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
+ * @version    0.7.0
  */
 
-
 /**
- * PHPWord_Exception
- *
- * @category PHPWord
- * @package PHPWord
- * @copyright Copyright (c) 2006 - 2013 PHPWord (http://www.codeplex.com/PHPWord)
+ * Class PHPWord_Exception
  */
-class PHPWord_Exception extends Exception {
-  /**
-   * Error handler callback
-   *
-   * @param mixed $code
-   * @param mixed $string
-   * @param mixed $file
-   * @param mixed $line
-   * @param mixed $context
-   */
-  public static function errorHandlerCallback($code, $string, $file, $line, $context) {
-    $e = new self($string, $code);
-    $e->line = $line;
-    $e->file = $file;
-    throw $e;
-  }
+class PHPWord_Exception extends Exception
+{
+    /**
+     * Error handler callback
+     *
+     * @param mixed $code
+     * @param mixed $string
+     * @param mixed $file
+     * @param mixed $line
+     * @param mixed $context
+     */
+    public static function errorHandlerCallback($code, $string, $file, $line, $context)
+    {
+        $e = new self($string, $code);
+        $e->line = $line;
+        $e->file = $file;
+        throw $e;
+    }
 }

Classes/PHPWord/Exception.php

@@ -20,12 +20,11 @@
  *
  * @category   PHPWord
  * @package    PHPWord
- * @copyright  Copyright (c) 2013 PHPWord (http://www.codeplex.com/PHPWord)
+ * @copyright  Copyright (c) 2013 PHPWord
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
  * @version    0.7.0
  */
 
-
 /**
  * PHPWord_HashTable
  */

Classes/PHPWord/HashTable.php

@@ -20,7 +20,7 @@
  *
  * @category   PHPWord
  * @package    PHPWord
- * @copyright  Copyright (c) 2013 PHPWord (http://www.codeplex.com/PHPWord)
+ * @copyright  Copyright (c) 2013 PHPWord
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
  * @version    0.7.0
  */

Classes/PHPWord/IOFactory.php

@@ -20,7 +20,7 @@
  *
  * @category   PHPWord
  * @package    PHPWord
- * @copyright  Copyright (c) 2013 PHPWord (http://www.codeplex.com/PHPWord)
+ * @copyright  Copyright (c) 2013 PHPWord
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
  * @version    0.7.0
  */