summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2017-05-18 12:35:55 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2017-05-18 12:35:55 +0200
commit731825282fadb9566e7590315f2bfb1daed1e34d (patch)
tree80268887abe2ed297eca042164f96c4108373dcc
parent9feb7f7039a3b59974cbf266922177e961a52dd1 (diff)
Branch libreoffice-5-4
This is 'libreoffice-5-4' - the stable branch for the 5.4.x releases. The commit rules are different according to the development phase: A. 5.4.0 beta phase: A. any bug fixes are allowed without review B. late features need approval by 3 people with different affiliation B. 5.4.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: I6b449b8a87e9a70c844acc87fbcadcb84fdf90db
-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..0f8e2875a6cc 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,5 +3,5 @@ host=logerrit
port=29418
project=core
defaultremote=logerrit
-defaultbranch=master
+defaultbranch=libreoffice-5-4
diff --git a/dictionaries b/dictionaries
-Subproject e46b2a46dd51843bc388a6355bb54eafbbf864b
+Subproject af57ccb5b2f05e29c3241aa5e11d1f649408aea
diff --git a/helpcontent2 b/helpcontent2
-Subproject 7d4439d5b834de3cb9b7d0d1dc8afe41d30c76b
+Subproject 7bfd6c560679b0c606dbd18c3f377d582e013f5
diff --git a/translations b/translations
-Subproject ffe364726be8d78394cc5080d928b354e65febf
+Subproject d42b24090edb6138383737ffad7fcb8dcabec60