summaryrefslogtreecommitdiff
path: root/readlicense_oo
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2014-06-02 09:51:17 +0200
committerAndras Timar <andras.timar@collabora.com>2014-06-02 09:51:17 +0200
commitc0190efe9e2e27bd60fbf7e35a698e1e3c4ef77c (patch)
treedaf9a7e6cf042854e331c0f30bc04508fb94f33c /readlicense_oo
parentacdff9f9763847c992e0853022896cff781c5ffe (diff)
restore 2 deleted lines in CREDITS
Change-Id: I9ffd868d72f38f2d15373ce19ed0023644f19ac4
Diffstat (limited to 'readlicense_oo')
-rw-r--r--readlicense_oo/license/CREDITS.fodt4
1 files changed, 2 insertions, 2 deletions
diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt
index e1df1653fc60..be85bc71e093 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -3938,8 +3938,8 @@
<table:covered-table-cell/>
</table:table-row>
</table:table>
- <text:p text:style-name="Text_20_body">We do not distinguish between commits that were imported from the OOo code base and those who went directly into the LibreOffice code base as:</text:p>
- <text:p text:style-name="Text_20_body">Do note that LibreOffice is divided into 20 git repositories. Pushing a change into all repositories will be counted as 20 commits as there is no way to distinguish this from 20 separate commits.</text:p>
+ <text:p text:style-name="Text_20_body">We do not distinguish between commits that were imported from the OOo code base and those who went directly into the LibreOffice code base as:<text:line-break/>a) it is technically not possible to distinguish between commits that go directly into the LibreOffice code base and commits that were merged in from the OpenOffice.org code base, and<text:line-break/>b) contributors to the OOo code base should also be credited for the excellent work they do.</text:p>
+ <text:p text:style-name="Text_20_body">Do note that LibreOffice used to be divided into 20 git repositories. Pushing a change into all repositories will be counted as 20 commits as there is no way to distinguish this from 20 separate commits.</text:p>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Total contributions to the TDF Wiki</text:h>
<text:p text:style-name="P3">1750 individuals contributed: </text:p>
<table:table table:name="Tabelle5" table:style-name="Tabelle5">