summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2017-11-25 17:07:28 +0100
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2017-11-25 17:07:28 +0100
commitb4de69aa53c5baddaf1b375d7c951b77f20a4662 (patch)
treed48e9b31cb59150fa5bbf3d3a4fa1c981089eaa7
parent6eeac3539ea4cac32d126c5e24141f262eb5a4d9 (diff)
Branch libreoffice-6-0
This is 'libreoffice-6-0' - the stable branch for the 6.0.x releases. The commit rules are different according to the development phase: A. 6.0.0 beta phase: A. any bug fixes are allowed without review B. late features need approval by 3 people with different affiliation B. 6.0.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: I393c97653664be3c7757d68fe5a7409319b10e3d
-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..ec9d1f3cd807 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,5 +3,5 @@ host=logerrit
port=29418
project=core
defaultremote=logerrit
-defaultbranch=master
+defaultbranch=libreoffice-6-0
diff --git a/dictionaries b/dictionaries
-Subproject 56684558fb8bdb05cf8bc3e4c183e78de630dd6
+Subproject 1773e0e987d4ebe4b328b87a40f8f7155d12606
diff --git a/helpcontent2 b/helpcontent2
-Subproject 8aff7a4747fbabc5d8db9c9c52c1e67684965fd
+Subproject 06b521618b1abac6edb0f7131bce92c88776792
diff --git a/translations b/translations
-Subproject 24c9679f71975ebeb9c8b0922de4ec001883199
+Subproject c7a86de26fccaaffa80e8ed9141c668cc718dc3