39e4dd2259
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
20 lines
183 B
Plaintext
20 lines
183 B
Plaintext
.DS_Store
|
|
._*
|
|
.Spotlight-V100
|
|
.Trashes
|
|
Thumbs.db
|
|
Desktop.ini
|
|
.idea
|
|
phpunit.xml
|
|
composer.lock
|
|
composer.phar
|
|
vendor
|
|
/.settings
|
|
/.buildpath
|
|
/.project
|
|
/docs
|
|
*.odt
|
|
*.docx
|
|
*.rtf
|
|
*.txt
|
|
*.xml |