summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXisco Fauli <xiscofauli@libreoffice.org>2019-11-13 17:09:17 +0100
committerXisco Fauli <xiscofauli@libreoffice.org>2019-11-13 17:09:17 +0100
commit8a961d64fa47cee77d5a1252ba87856412b44e70 (patch)
tree5e3745c20b4f02a8fe9ed54478f4031f24d3f287
parenttdf#123851 Qt5 handle broken ScrollBar values (diff)
downloadcore-8a961d64fa47cee77d5a1252ba87856412b44e70.tar.gz
core-8a961d64fa47cee77d5a1252ba87856412b44e70.zip
Branch libreoffice-6-4
This is 'libreoffice-6-4' - the stable branch for the 6.4.x releases. The commit rules are different according to the development phase: A. 6.4.0 beta phase: A. any bug fixes are allowed without review B. late features need approval by 3 people with different affiliation B. 6.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.
-rw-r--r--.gitreview2
m---------dictionaries0
m---------helpcontent20
m---------translations0
4 files changed, 1 insertions, 1 deletions
diff --git a/.gitreview b/.gitreview
index 199752b8b09e..4cd7d22d9a83 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,5 +3,5 @@ host=gerrit.libreoffice.org
port=29418
project=core
defaultremote=logerrit
-defaultbranch=master
+defaultbranch=libreoffice-6-4
diff --git a/dictionaries b/dictionaries
-Subproject 4fb010374f3390e3b75a2e1f1fd491da2cf58c2
+Subproject fb36c9a4ad3707157606d4959fca32367f72e07
diff --git a/helpcontent2 b/helpcontent2
-Subproject 1a28d0647ccd790bac0c1dbdad6eda44a5c8eaa
+Subproject 3b2fd61e82d2ab68c941cfdd848ace5f91b0565
diff --git a/translations b/translations
-Subproject 6d4072204c5fc8d17f52a11ac01b23eba65a20f
+Subproject 4b508385646a7be7997f10f088fbf6343709c57