summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2016-05-26 00:19:10 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2016-05-26 00:19:10 +0200
commit92ed5973a0715822fb2aa1c3aaf1f6b53119eba0 (patch)
treec349b978b7127c2b53aab4828ba8a09a1b74e286
parentupdate credits (diff)
downloadcore-92ed5973a0715822fb2aa1c3aaf1f6b53119eba0.tar.gz
core-92ed5973a0715822fb2aa1c3aaf1f6b53119eba0.zip
Branch libreoffice-5-2
This is 'libreoffice-5-2' - the stable branch for the 5.2.x releases. The commit rules are different according to the development phase: A. 5.2.0 beta phase: A. any bug fixes are allowed without review B. late features need approval by 3 people with different affiliation B. 5.2.0 rc phase and later: A. fixes need approval by one reviewer B. late features need approval by 3 more people with different affiliation IMPORTANT: Every developer is responsible for pushing the fixes into all appropriate branches. Note that we do not plan any merge from this branch to master or vice versa. Please, help use to make stable and usable release. If you want to build something cool, unstable, and risky, use master. Change-Id: I0d128c867fa28abb632e77bc5af0361d664fbf1e
-rw-r--r--.gitreview2
m---------dictionaries0
m---------helpcontent20
m---------translations0
4 files changed, 1 insertions, 1 deletions
diff --git a/.gitreview b/.gitreview
index 094c974be145..13446a7f6d4b 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,5 +3,5 @@ host=logerrit
port=29418
project=core
defaultremote=logerrit
-defaultbranch=master
+defaultbranch=libreoffice-5-2
diff --git a/dictionaries b/dictionaries
-Subproject 697bbfa625583164f546b3f58a18858b56b871e
+Subproject 7ec3bae0ae0ae4274d3377b5995f13fb155ba6b
diff --git a/helpcontent2 b/helpcontent2
-Subproject f2361eb91e2e47b0ecbc02bedb8763c08007f0c
+Subproject 97922d2199577a138f7336c0a0bf045b93204b5
diff --git a/translations b/translations
-Subproject 155bdb645119af4f39f846c9b4e72157df126da
+Subproject 1b5f139ff89a6041aec6aefc66d3d275a21b78e