summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2014-05-21 19:05:22 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2014-05-21 19:05:22 +0200
commit2ca316971f2e50fff94267bda23d32735b694431 (patch)
treeb43e2e7c07b8a6f54ced9f748bba885ae84719a5
parentc15927f20d4727c3b8de68497b6949e72f9e6e9e (diff)
Branch libreoffice-4-3
This is 'libreoffice-4-3' - the stable branch for the 4.3.x releases. The commit rules are different according to the development phase: + 4.3.0 beta phase: + any bug fixes are allowed without review + late features need approval by 3 people with different affiliation + 4.3.0 rc phase and later: + fixes need approval by one reviewer + 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: Idf8be761c6f0366c16e7d9f395ac8b93a0cd1ad8
-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..39d26eacf93a 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,5 +3,5 @@ host=logerrit
port=29418
project=core
defaultremote=logerrit
-defaultbranch=master
+defaultbranch=libreoffice-4-3
diff --git a/dictionaries b/dictionaries
-Subproject b31244205066114f5721beef118be7f9e518cd2
+Subproject 5abbb92955feb9b88be7dd5edd665b5cc183844
diff --git a/helpcontent2 b/helpcontent2
-Subproject 2ef15cb93840390d9927f64bddb958ad699cb79
+Subproject 02a9b0e2b5302d572fb08fd76f83d15e7851afe
diff --git a/translations b/translations
-Subproject b1ee9c9e1542b856cfe2412c6dffeeb5a353810
+Subproject 6c2c46db3641281b7f7a89a6e079fe2d4f5b080