Merge branch 'refs/heads/notices-warnings' into v0.5
* refs/heads/notices-warnings: Remove some notices/warnings. refs #1650 Fix line endings in a few files Conflicts: com/ExcelWriter/PHPExcel/CachedObjectStorage/APC.php com/ExcelWriter/PHPExcel/CachedObjectStorage/DiscISAM.php com/ExcelWriter/PHPExcel/CachedObjectStorage/Memcache.php com/ExcelWriter/PHPExcel/CachedObjectStorage/MemoryGZip.php com/ExcelWriter/PHPExcel/CachedObjectStorage/MemorySerialized.php com/ExcelWriter/PHPExcel/CachedObjectStorage/PHPTemp.php com/ExcelWriter/PHPExcel/CachedObjectStorage/Wincache.php com/ExcelWriter/PHPExcel/Reader/Excel2007.php com/ExcelWriter/PHPExcel/Reader/Excel5.php com/ExcelWriter/PHPExcel/Shared/PCLZip/gnu-lgpl.txt com/ExcelWriter/PHPExcel/Shared/PCLZip/pclzip.lib.php com/ExcelWriter/PHPExcel/Shared/PCLZip/readme.txt com/ExcelWriter/PHPExcel/Shared/PDF/cache/utf8test.txt com/ExcelWriter/PHPExcel/Shared/PDF/fonts/almohanad.php com/ExcelWriter/PHPExcel/Shared/PDF/fonts/arialunicid0-chinese-simplified.php com/ExcelWriter/PHPExcel/Shared/PDF/fonts/arialunicid0-chinese-traditional.php com/ExcelWriter/PHPExcel/Shared/PDF/fonts/arialunicid0-japanese.php com/ExcelWriter/PHPExcel/Shared/PDF/fonts/arialunicid0-korean.php com/ExcelWriter/PHPExcel/Shared/PDF/fonts/arialunicid0.php com/ExcelWriter/PHPExcel/Shared/PDF/fonts/symbol.php com/ExcelWriter/PHPExcel/Shared/PDF/fonts/utils/makeallttffonts.php com/ExcelWriter/PHPExcel/Shared/PDF/fonts/utils/src/readme.txt com/ExcelWriter/PHPExcel/Shared/PDF/fonts/zapfdingbats.php com/ExcelWriter/PHPExcel/Shared/PDF/fonts/zarbold.php com/ExcelWriter/PHPExcel/Shared/PDF/images/bug.eps
Showing
2 changed files
with
14 additions
and
2 deletions
-
Please register or sign in to post a comment