You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@corinthia.apache.org by pm...@apache.org on 2015/01/10 21:56:45 UTC
[8/8] incubator-corinthia git commit: Merge branch 'master' into
stable
Merge branch 'master' into stable
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/ba402918
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/ba402918
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/ba402918
Branch: refs/heads/stable
Commit: ba402918b9dd91ba457fb49f50bceacab4c198f1
Parents: c1c1df8 ce0e3d5
Author: Peter Kelly <pe...@uxproductivity.com>
Authored: Sun Jan 11 03:56:28 2015 +0700
Committer: Peter Kelly <pe...@uxproductivity.com>
Committed: Sun Jan 11 03:56:28 2015 +0700
----------------------------------------------------------------------
DocFormats/core/src/lib/DFFilesystem.c | 16 -------
DocFormats/core/src/lib/DFFilesystem.h | 1 -
DocFormats/filters/ooxml/src/word/Word.c | 25 ++--------
.../filters/ooxml/src/word/WordConverter.c | 48 +++++++++++++++++---
.../filters/ooxml/src/word/WordConverter.h | 13 +++---
DocFormats/filters/ooxml/src/word/WordPackage.c | 26 -----------
DocFormats/filters/ooxml/src/word/WordPackage.h | 4 --
consumers/dftest/src/main.c | 24 +++-------
consumers/dfutil/src/Commands.c | 23 +---------
9 files changed, 60 insertions(+), 120 deletions(-)
----------------------------------------------------------------------