Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into calcEngine

Conflicts: Classes/PHPExcel.php Classes/PHPExcel/Worksheet.php
2026-09-25 01:31:26 +00:00 · 2013-02-13 09:09:28 +00:00
parent b589fab56b 245a1dc832
commit 5451b63cdc
11 changed files with 1496 additions and 1444 deletions
@@ -110,7 +110,7 @@ class PHPExcel_Chart_PlotArea
 	/**
 	 * Set Plot Series
 	 *
-	 * @param array of PHPExcel_Chart_DataSeries
+	 * @param [PHPExcel_Chart_DataSeries]
 	 */
 	public function setPlotSeries($plotSeries = array()) {
 		$this->_plotSeries = $plotSeries;