You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@corinthia.apache.org by fr...@apache.org on 2015/04/29 14:43:57 UTC
[16/17] incubator-corinthia git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-corinthia
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-corinthia
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/46ae266f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/46ae266f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/46ae266f
Branch: refs/heads/master
Commit: 46ae266f9045e9ade16a55dd0b9bcc47113b321e
Parents: 5033c0f ccd0836
Author: franzdecopenhague <fr...@outlook.com>
Authored: Mon Apr 27 13:02:33 2015 +0000
Committer: franzdecopenhague <fr...@outlook.com>
Committed: Mon Apr 27 13:02:33 2015 +0000
----------------------------------------------------------------------
CorinthiaDirectoryTree.html | 4 +-
DocFormats/api/src/Operations.c | 9 +--
DocFormats/filters/odf/CMakeLists.txt | 4 +-
DocFormats/filters/odf/src/text/ODFText.c | 59 +++++++++++++++++++-
.../filters/odf/src/text/ODFTextConverter.c | 53 ++++++++++++++++++
.../filters/odf/src/text/ODFTextConverter.h | 42 ++++++++++++++
6 files changed, 163 insertions(+), 8 deletions(-)
----------------------------------------------------------------------