Roman Syroeshko db1d89ab23 Merge remote-tracking branch 'origin/develop' into develop ...

Conflicts:
	src/PhpWord/Element/Section.php
	src/PhpWord/Endnotes.php
	src/PhpWord/Footnotes.php
	src/PhpWord/Media.php
	src/PhpWord/PhpWord.php
	src/PhpWord/Reader/Word2007.php
	src/PhpWord/Writer/AbstractWriter.php
	src/PhpWord/Writer/ODText/Content.php
	src/PhpWord/Writer/Word2007.php
	src/PhpWord/Writer/Word2007/Notes.php

2014-04-16 17:39:26 +04:00

..

PCLZip

Merge and modify 'pclzip' of https://github.com/bskrtich/PHPWord to make it work with the latest develop branch

2014-03-29 00:12:53 +07:00

Drawing.php

Refactor Media, addObject to header and footer

2014-04-04 15:28:35 +07:00

Font.php

DocBlock and use fixes

2014-04-03 10:13:13 +07:00

String.php

Additional unit tests and some code deduplication

2014-04-11 21:28:43 +07:00

XMLReader.php

Update upcoming version number to 0.10.0 as per #178

2014-04-11 19:04:53 +07:00

XMLWriter.php

[IMPROVED] Dockblocks as per https://github.com/PHPOffice/PHPWord/pull/187.

2014-04-16 17:22:30 +04:00

ZipArchive.php

Merge remote-tracking branch 'origin/develop' into develop

2014-04-16 17:39:26 +04:00