summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2014-07-09 18:06:55 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2014-07-09 18:06:55 +0200
commit8a262b50f401a27c342e0f763fae24ef26583678 (patch)
tree89900e652c1efbf1c429fc2daf7c1ff67f7aee56
parentbnc#882383: Do not ignore themeOverride for charts in .pptx (diff)
downloadcore-8a262b50f401a27c342e0f763fae24ef26583678.tar.gz
core-8a262b50f401a27c342e0f763fae24ef26583678.zip
Branch libreoffice-4-2-6
This is 'libreoffice-4-2-6' - the stable branch for the 4.2.6 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.2.x release, please use the 'libreoffice-4-2' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I9ab3c759892c827ef8b26e83712c526facccebe5
-rw-r--r--.gitreview2
m---------dictionaries0
m---------helpcontent20
m---------translations0
4 files changed, 1 insertions, 1 deletions
diff --git a/.gitreview b/.gitreview
index 710fd1e8178e..3cea26166316 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,5 +3,5 @@ host=logerrit
port=29418
project=core
defaultremote=logerrit
-defaultbranch=libreoffice-4-2
+defaultbranch=libreoffice-4-2-6
diff --git a/dictionaries b/dictionaries
-Subproject 8fd0010032962507764ffbfd92e3757f8d62612
+Subproject 4a43e761b51639b31c6b79fd747f377f7bd0b3e
diff --git a/helpcontent2 b/helpcontent2
-Subproject 7d73db5cf05eb0cd0c01536667fc021367b0aa9
+Subproject ca540b43eed07331bb1572225b011cb608114fb
diff --git a/translations b/translations
-Subproject ade9b0b52531db428b25b36dc3e3bfcfe880a06
+Subproject 1b1d4f8e4596bf55b531a37617a5ea0763abe5f