Commit Graph

9 Commits

Author SHA1 Message Date
jhfangying 0779581fe7 ignore 2014-03-13 13:33:24 +08:00
Progi1984 9b793e5db1 Unit Tests on Section directory 2014-03-09 19:09:22 +01:00
Gabriel Bull 39e4dd2259 Merge branch 'master' of https://github.com/PHPOffice/PHPWord
Conflicts:
	.gitignore
	Classes/PHPWord.php
	Classes/PHPWord/Section.php
	Classes/PHPWord/Section/Footer.php
	Classes/PHPWord/Section/Header.php
	Classes/PHPWord/Section/Table/Cell.php
	Classes/PHPWord/Section/TextRun.php
	Classes/PHPWord/Shared/String.php
	Classes/PHPWord/Style/Cell.php
	Classes/PHPWord/Style/Paragraph.php
	Classes/PHPWord/Template.php
	Classes/PHPWord/Writer/Word2007.php
	Classes/PHPWord/Writer/Word2007/Base.php
	Classes/PHPWord/Writer/Word2007/Document.php
	Examples/AdvancedTable.php
	Examples/BasicTable.php
	Examples/HeaderFooter.php
	Examples/Link.php
	Examples/ListItem.php
	Examples/Object.php
	Examples/Section.php
	Examples/Template.php
	Examples/Textrun.php
	Examples/TitleTOC.php
	Examples/Watermark.php
	Examples/_earth.JPG
	Examples/_mars.jpg
	Examples/_sheet.xls
	changelog.txt
	samples/old/AdvancedTable.php
	samples/old/BasicTable.php
	samples/old/Image.php
	samples/old/Link.php
	samples/old/ListItem.php
	samples/old/Object.php
	samples/old/Section.php
	samples/old/Template.php
	samples/old/Textrun.php
	samples/old/TitleTOC.php
	samples/old/Watermark.php
	samples/old/_earth.jpg
	samples/old/_mars.jpg
	samples/old/_sheet.xls
	src/Examples/AdvancedTable.php
	src/Examples/BasicTable.php
	src/Examples/Link.php
	src/Examples/ListItem.php
	src/Examples/Object.php
	src/Examples/Section.php
	src/Examples/Template.php
	src/Examples/Textrun.php
	src/Examples/TitleTOC.php
	src/Examples/Watermark.php
	src/Examples/_earth.JPG
	src/Examples/_mars.jpg
	src/Examples/_sheet.xls
2013-12-15 14:15:28 -05:00
Progi1984 38a15e5da5 Word2007 : Support for tab stops 2013-12-15 14:35:18 +01:00
Progi1984 0d19d57cba IMPROVED : Moved examples out of Classes directory 2013-12-15 13:35:17 +01:00
Gabriel Bull 50a9ab52b0 Added Unit Tests and fixed bugs with Autoloader 2013-12-11 15:08:54 -05:00
Gabriel Bull 8c4efdd607 Added support for composer 2013-12-11 14:39:43 -05:00
Progi1984 f29ce0fc4a CHANGED : .gitignore 2012-05-30 00:05:31 +02:00
Progi1984 de11f4d038 ADDED : .gitignore 2012-05-29 20:56:28 +02:00