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:56 UTC

[15/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/5033c0fe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/5033c0fe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/5033c0fe

Branch: refs/heads/master
Commit: 5033c0fe8253bfab5afef2d0186f5911304a65b8
Parents: 411171e 80abb72
Author: franzdecopenhague <fr...@outlook.com>
Authored: Mon Apr 20 14:16:06 2015 +0000
Committer: franzdecopenhague <fr...@outlook.com>
Committed: Mon Apr 20 14:16:06 2015 +0000

----------------------------------------------------------------------
 CorinthiaDirectoryTree.html                |  222 +++
 consumers/dfconvert/src/main.c             |    2 +
 sample/README.txt                          |    3 +
 sample/code/objc_bindings/EDJSInterface.h  |  367 +++++
 sample/code/objc_bindings/EDJSInterface.m  | 1788 +++++++++++++++++++++++
 sample/code/objc_bindings/WARNING          |   12 +
 sample/documents/INDEX                     |   29 +
 sample/documents/docx/we-need-more-samples |    0
 sample/documents/html/h1-6_center_p.html   |   27 +
 sample/documents/html/lists.html           |   18 +
 sample/documents/html/simple_1.html        |   18 +
 sample/documents/html/table.html           |   33 +
 sample/documents/odf/we-need-more-samples  |    0
 sample/documents/tex/we-need-more-samples  |    0
 sample/documents/we-need-more-samples      |    0
 sample_code/objc_bindings/EDJSInterface.h  |  367 -----
 sample_code/objc_bindings/EDJSInterface.m  | 1788 -----------------------
 sample_code/objc_bindings/WARNING          |   12 -
 sample_documents/INDEX                     |   29 -
 sample_documents/docx/we-need-more-samples |    0
 sample_documents/html/h1-6_center_p.html   |   27 -
 sample_documents/html/lists.html           |   18 -
 sample_documents/html/simple_1.html        |   18 -
 sample_documents/html/table.html           |   33 -
 sample_documents/odf/we-need-more-samples  |    0
 sample_documents/tex/we-need-more-samples  |    0
 sample_documents/we-need-more-samples      |    0
 27 files changed, 2519 insertions(+), 2292 deletions(-)
----------------------------------------------------------------------