You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@corinthia.apache.org by ja...@apache.org on 2015/02/23 20:26:28 UTC

[3/3] incubator-corinthia git commit: Merge branch 'master' into experimentzip

Merge branch 'master' into experimentzip


Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/5a745c87
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/5a745c87
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/5a745c87

Branch: refs/heads/experimentzip
Commit: 5a745c873148ddbdf2127786ded9faec8afbc930
Parents: 1baa03d 227d59d
Author: jani <ja...@apache.org>
Authored: Mon Feb 23 20:25:51 2015 +0100
Committer: jani <ja...@apache.org>
Committed: Mon Feb 23 20:25:51 2015 +0100

----------------------------------------------------------------------
 DocFormats/api/src/Operations.c | 160 +++++++++++++++++++++++++----------
 Editor/src/Position.js          |  25 ++++++
 2 files changed, 138 insertions(+), 47 deletions(-)
----------------------------------------------------------------------