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/02 14:50:19 UTC
[10/10] 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/d23ccd54
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/d23ccd54
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/d23ccd54
Branch: refs/heads/stable
Commit: d23ccd545719be712337c6874775c31cc5681a35
Parents: 7403026 f27803f
Author: Peter Kelly <pe...@uxproductivity.com>
Authored: Fri Jan 2 20:49:55 2015 +0700
Committer: Peter Kelly <pe...@uxproductivity.com>
Committed: Fri Jan 2 20:49:55 2015 +0700
----------------------------------------------------------------------
DocFormats/api/CMakeLists.txt | 1 -
DocFormats/core/CMakeLists.txt | 1 -
DocFormats/core/src/lib/DFZipFile.c | 139 ++++++++---------
DocFormats/filters/latex/CMakeLists.txt | 1 -
DocFormats/filters/odf/CMakeLists.txt | 1 -
DocFormats/filters/ooxml/CMakeLists.txt | 1 -
DocFormats/platform/CMakeLists.txt | 8 +-
DocFormats/platform/headers/DFPlatform.h | 17 +++
DocFormats/platform/src/Win32.c | 4 +-
DocFormats/platform/src/Wrapper.c | 146 ++++++++++++++++++
DocFormats/platform/tests/OStests.c | 197 +++++++++++++++++++++++++
DocFormats/platform/tests/PlatformTests.c | 27 ----
DocFormats/platform/tests/WrapperTests.c | 83 +++++++++++
DocFormats/unittest/CMakeLists.txt | 1 -
consumers/dftest/src/main.c | 6 +-
external/extract_downloads.sh | 1 +
external/fetch_downloads.bat | 32 ++++
external/wget-win.js | 30 ++++
18 files changed, 575 insertions(+), 121 deletions(-)
----------------------------------------------------------------------