Merge branch 'develop_1.7.9' into develop_2.0.0

This commit is contained in:
Mark Baker 2013-06-15 00:05:24 +01:00
commit a3ac720294
2 changed files with 2 additions and 2 deletions

View File

@ -177,7 +177,7 @@ CATEGORY_LOOKUP_AND_REFERENCE
COLUMN PHPExcel_Calculation_LookupRef::COLUMN COLUMN PHPExcel_Calculation_LookupRef::COLUMN
COLUMNS PHPExcel_Calculation_LookupRef::COLUMNS COLUMNS PHPExcel_Calculation_LookupRef::COLUMNS
GETPIVOTDATA *** Not yet Implemented GETPIVOTDATA *** Not yet Implemented
HLOOKUP *** Not yet Implemented HLOOKUP PHPExcel_Calculation_LookupRef::HLOOKUP
HYPERLINK PHPExcel_Calculation_LookupRef::HYPERLINK HYPERLINK PHPExcel_Calculation_LookupRef::HYPERLINK
INDEX PHPExcel_Calculation_LookupRef::INDEX INDEX PHPExcel_Calculation_LookupRef::INDEX
INDIRECT PHPExcel_Calculation_LookupRef::INDIRECT INDIRECT PHPExcel_Calculation_LookupRef::INDIRECT

View File

@ -146,7 +146,7 @@ HARMEAN CATEGORY_STATISTICAL PHPExcel_Calculation_Sta
HEX2BIN CATEGORY_ENGINEERING PHPExcel_Calculation_Engineering::HEXTOBIN HEX2BIN CATEGORY_ENGINEERING PHPExcel_Calculation_Engineering::HEXTOBIN
HEX2DEC CATEGORY_ENGINEERING PHPExcel_Calculation_Engineering::HEXTODEC HEX2DEC CATEGORY_ENGINEERING PHPExcel_Calculation_Engineering::HEXTODEC
HEX2OCT CATEGORY_ENGINEERING PHPExcel_Calculation_Engineering::HEXTOOCT HEX2OCT CATEGORY_ENGINEERING PHPExcel_Calculation_Engineering::HEXTOOCT
HLOOKUP CATEGORY_LOOKUP_AND_REFERENCE *** Not yet Implemented HLOOKUP CATEGORY_LOOKUP_AND_REFERENCE PHPExcel_Calculation_LookupRef::HLOOKUP
HOUR CATEGORY_DATE_AND_TIME PHPExcel_Calculation_DateTime::HOUROFDAY HOUR CATEGORY_DATE_AND_TIME PHPExcel_Calculation_DateTime::HOUROFDAY
HYPERLINK CATEGORY_LOOKUP_AND_REFERENCE PHPExcel_Calculation_LookupRef::HYPERLINK HYPERLINK CATEGORY_LOOKUP_AND_REFERENCE PHPExcel_Calculation_LookupRef::HYPERLINK
HYPGEOMDIST CATEGORY_STATISTICAL PHPExcel_Calculation_Statistical::HYPGEOMDIST HYPGEOMDIST CATEGORY_STATISTICAL PHPExcel_Calculation_Statistical::HYPGEOMDIST