diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-11-12 05:59:39 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-11-12 05:59:39 +0100 |
| commit | 80c83f4a578e1ec0c8b5e439687716e365937c9a (patch) | |
| tree | 6787026b8c979b9716a5a05f9a15cead33e22e0c /unoxml | |
| parent | b49bea154047efeb9e487dde6c9742cf31c11400 (diff) | |
Revert "Revert "wrong merge conflict resolution, vcldemo, icontest go to instdir""
This reverts commit b64caa8ad85d951c74e1c84096802997340c8e1b.
Diffstat (limited to 'unoxml')
0 files changed, 0 insertions, 0 deletions