summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2018-05-24 18:50:20 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2018-05-24 18:50:20 +0200
commit0bb6c991aae197d79282ca0c1fdccb0f2a757389 (patch)
tree688b5fffc5228e4038086fb15aaaf62f82bb37a1
parent3a801799536e6870f2fb111b1cc00b9575a35a39 (diff)
Branch libreoffice-6-1
This is 'libreoffice-6-1' - the stable branch for the 6.1.x releases. The commit rules are different according to the development phase: A. 6.1.0 beta phase: A. any bug fixes are allowed without review B. late features need approval by 3 people with different affiliation B. 6.1.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: I004b74c542a12c7eee5623a345a9efabb0402f4e
-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..040bbce83108 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,5 +3,5 @@ host=logerrit
port=29418
project=core
defaultremote=logerrit
-defaultbranch=master
+defaultbranch=libreoffice-6-1
diff --git a/dictionaries b/dictionaries
-Subproject e90e83b23b6ace35349fc2b3e65bd2d69c80ddd
+Subproject 838994eb0eca47f23381a654111b2c015968df7
diff --git a/helpcontent2 b/helpcontent2
-Subproject 31d3025c0610319fd545b52f41211f86530eede
+Subproject 03b4b8065266d30bfc9b149e20b7439581a0280
diff --git a/translations b/translations
-Subproject ed31445a5c607b49bf71cd37055578de6785cb8
+Subproject 539a736076b24081f501ed48912199829d03b23