Conflicts: shell/source/backends/gconfbe/gconfbackend.cxx Change-Id: I609ec83ec59f5ae8d3a8c9c09649695bfcb03b87 Reviewed-on: https://gerrit.libreoffice.org/19408 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
With the new RHEL6-era baseline TDF can finally ship KDE4 support. Change-Id: I227278b576a3ed2f2aaa751d41b469ca92dc78b3 Reviewed-on: https://gerrit.libreoffice.org/18267 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Change-Id: I882c04fd3a255f55511b1884157de26e7574e6db Reviewed-on: https://gerrit.libreoffice.org/18262 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Change-Id: I3df1216054c133314b2317849744a0a37e9fbc8f Reviewed-on: https://gerrit.libreoffice.org/13733 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Change-Id: I35f9b2dcb821bda0ea97de12a8ae8d27915f6b3e
Change-Id: I198f77d927c9283914924440cdf0cece619bc867
Change-Id: I3320b3ce3307598a479dfac5b120e85441c670dc
Change-Id: Ia497f9799a1ca0c77f14e2f4a4a8ecddc917f447