corinthia-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fr...@apache.org
Subject [02/17] incubator-corinthia git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-corinthia
Date Wed, 29 Apr 2015 12:43:43 GMT
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/88051ae8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/88051ae8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/88051ae8

Branch: refs/heads/master
Commit: 88051ae8f67040b8951bb77fd83e905d15fc627d
Parents: 0cb481d ebe52ba
Author: franzdecopenhague <franzdecopenhague@outlook.com>
Authored: Fri Mar 13 02:07:57 2015 +0000
Committer: franzdecopenhague <franzdecopenhague@outlook.com>
Committed: Fri Mar 13 02:07:57 2015 +0000

----------------------------------------------------------------------
 CMakeLists.txt                                 |    9 +-
 DocFormats/CMakeLists.txt                      |    1 -
 DocFormats/core/src/lib/DFString.c             |    2 +-
 DocFormats/core/src/xml/DFXML.c                |    2 +-
 DocFormats/filters/ooxml/src/word/WordStyles.c |    2 +-
 DocFormats/headers/DFPlatform.h                |    4 +-
 DocFormats/platform/src/Linux.c                |    2 +-
 DocFormats/platform/src/Unix.c                 |    2 +-
 consumers/corinthia/src/CMakeLists.txt         |   68 ++
 consumers/corinthia/src/desktop.cpp            |   53 +
 consumers/corinthia/src/desktop.ui             |   72 ++
 consumers/corinthia/src/editWindows.h          |   36 +
 consumers/corinthia/src/main.cpp               |   30 +
 consumers/dfconvert/src/CMakeLists.txt         |    1 -
 consumers/dftest/src/CMakeLists.txt            |    1 -
 consumers/dfutil/src/CMakeLists.txt            |    1 -
 consumers/web/client/builtin.css               |   36 +
 consumers/web/client/images/bold-on.png        |  Bin 0 -> 2288 bytes
 consumers/web/client/images/bold.png           |  Bin 0 -> 4847 bytes
 consumers/web/client/images/indent.png         |  Bin 0 -> 4257 bytes
 consumers/web/client/images/italic-on.png      |  Bin 0 -> 1909 bytes
 consumers/web/client/images/italic.png         |  Bin 0 -> 4485 bytes
 consumers/web/client/images/list-none-on.png   |  Bin 0 -> 1805 bytes
 consumers/web/client/images/list-none.png      |  Bin 0 -> 4364 bytes
 consumers/web/client/images/list-ol-on.png     |  Bin 0 -> 1977 bytes
 consumers/web/client/images/list-ol.png        |  Bin 0 -> 4509 bytes
 consumers/web/client/images/list-ul-on.png     |  Bin 0 -> 1807 bytes
 consumers/web/client/images/list-ul.png        |  Bin 0 -> 4385 bytes
 consumers/web/client/images/outdent.png        |  Bin 0 -> 4292 bytes
 consumers/web/client/images/underline-on.png   |  Bin 0 -> 2082 bytes
 consumers/web/client/images/underline.png      |  Bin 0 -> 4671 bytes
 consumers/web/client/index.html                |   88 ++
 consumers/web/client/interface.js              |  371 ++++++
 consumers/web/client/sample.html               | 1130 +++++++++++++++++++
 consumers/web/client/ui.js                     |   75 ++
 consumers/web/client/uxeditor.js               |  344 ++++++
 36 files changed, 2317 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/88051ae8/CMakeLists.txt
----------------------------------------------------------------------


Mime
View raw message