Commit Graph

9 Commits

Author SHA1 Message Date
Ivan Lanin d3f62567e9 Merge remote-tracking branch 'remotes/upstream/develop' into develop
Conflicts:
	Classes/PHPWord/Section/Settings.php
	Classes/PHPWord/Section/TextRun.php
	Classes/PHPWord/Writer/Word2007/Base.php
	README.md
2014-03-06 12:32:23 +07:00
Gabriel Bull 3cf069fc46 Happy new year! 2014-02-12 11:21:04 -05:00
Ivan Lanin d3e8b69cc4 Remove (int) since there's a possibility for fraction 2014-01-02 01:30:57 +07:00
Ivan Lanin 72e8f3fccf Fix comment error 2014-01-02 01:02:01 +07:00
Ivan Lanin 0edaaaab50 Tidy up for pull request 2014-01-02 00:59:38 +07:00
Ivan Lanin 3037fbf59e Read README.md 2014-01-01 18:59:19 +07:00
Gabriel Bull d09f0958c6 Fixed some merge issues 2013-12-16 06:40:30 -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