summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-07-25Version 3.4.2.3, tag libreoffice-3.4.2.3 (3.4.2-rc3)libreoffice-3.4.2.3libreoffice-3.4.2-finallibreoffice-3-4-2Petr Mladek0-0/+0
2011-07-19Version 3.4.2.2, tag libreoffice-3.4.2.2 (3.4.2-rc2)libreoffice-3.4.2.2Petr Mladek0-0/+0
2011-07-12Branch libreoffice-3-4-2Petr Mladek0-0/+0
This is 'libreoffice-3-4-2' - the stable branch for the 3.4.2 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.4.x release, please use the 'libreoffice-3-4' branch. If you want to build something cool, unstable, and risky, use master.
2011-07-12Version 3.4.2.1, tag libreoffice-3.4.2.1 (3.4.2-rc1)libreoffice-3.4.2.1Petr Mladek0-0/+0
2011-07-09This makefile is for a standard Make, so use TABsTor Lillqvist1-4/+5
(cherry picked from commit ff2c05d7b1411aeb67dc0ba415a1ec50db6331d6) Signed-off-by: Caolán McNamara <caolanm@redhat.com>
2011-06-29bad merge, fix to enable extensions to build againCaolán McNamara1-6/+0
(cherry picked from commit 194da0076d3b4a6968496261fd2eaca9e8e955f9)
2011-06-14Version 3.4.1.1, tag libreoffice-3.4.1.1 (3.4.1-rc1)libreoffice-3.4.1.1Petr Mladek0-0/+0
2011-05-17Version 3.4.0.1, tag libreoffice-3.4.0.1 (3.4.0-rc1)libreoffice-3.4.0.1Petr Mladek0-0/+0
2011-05-10Version 3.3.99.5, tag libreoffice-3.3.99.5 (3.4.0-beta5)libreoffice-3.3.99.5Petr Mladek0-0/+0
2011-05-03Version 3.3.99.4, tag libreoffice-3.3.99.4 (3.4.0-beta4)libreoffice-3.3.99.4Petr Mladek0-0/+0
2011-04-26Version 3.3.99.3, tag libreoffice-3.3.99.3 (3.4.0-beta3)libreoffice-3.3.99.3Petr Mladek0-0/+0
2011-04-19Version 3.3.99.2, tag libreoffice-3.3.99.2 (3.4.0-beta2)libreoffice-3.3.99.2integration/dev300_m106Petr Mladek0-0/+0
2011-04-13Even more OOo -> LO changes (in comments now)Fridrich Štrba1-5/+5
2011-04-13Some more OOo -> LO changesFridrich Štrba1-2/+2
2011-04-11Version 3.3.99.1, tag libreoffice-3.3.99.1 (3.4.0-beta1)libreoffice-3.3.99.1Petr Mladek0-0/+0
2011-04-05Merge remote-tracking branch 'origin/libreoffice-3-3' into libreoffice-3-4Petr Mladek1-0/+6
Conflicts: odk/settings/settings.mk
2011-04-01Branch libreoffice-3-4Petr Mladek0-0/+0
This is 'libreoffice-3-4' - the stable branch for the 3.4.x releases + only bug fixes are allowed + no approval needed during beta phase (two weeks after branch) + 1 approval needed during rc phase and for bugfix releases + 2 approvals with different/no affiliation needed for late features + regularly merged into master by a selected person when living Please watch http://wiki.documentfoundation.org/ReleasePlan and read announces on libreoffice@lists.freedesktop.org If you want to build something cool, unstable, and risky, use master.
2011-03-29drop bogus executable flag from idl/build/src and config filesFrancisco Saito6-0/+0
2011-03-29drop bogus executable flag from image filesFrancisco Saito6-0/+0
2011-03-24Some OOo -> LO changes (hopeful nothing broke with them)Fridrich Štrba5-25/+25
2011-03-23Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/sdkJan Holesovsky1-3/+3
2011-03-23Merge commit 'ooo/DEV300_m103'Jan Holesovsky90-954/+1291
Conflicts: odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx odk/examples/cpp/complextoolbarcontrols/exports.cxx odk/examples/cpp/counter/countermain.cxx odk/examples/cpp/remoteclient/remoteclient.cxx odk/settings/settings.mk
2011-03-22Trying to remove NODEFAULTLIB on WindowsFridrich Štrba1-3/+3
2011-03-19Move OSL_ENSURE(sal_False,...) to OSL_FAIL(...)Thomas Arnhold5-5/+5
2011-03-17Merge remote-tracking branch 'origin/integration/dev300_m101'Jan Holesovsky6-174/+33
2011-03-12Move OSL_ENSURE(0,...) to OSL_FAIL(...)Thomas Arnhold3-4/+4
2011-03-08Merge commit 'ooo/DEV300_m101' into integration/dev300_m101integration/dev300_m101Norbert Thiebaud6-174/+33
* commit 'ooo/DEV300_m101': sb138: #i116038# fresh implementation of binary URP bridge dba34b: #i106807# use mysql instead of adabas now sb126: #i112627# adapted SDK/DevGuide to configmgr re-write Conflicts: odk/util/makefile.pmk
2011-03-08Version 3.3.2.1, tag libreoffice-3.3.2.1 (3.3.2-rc1)libreoffice-3.3.2.1Petr Mladek0-0/+0
2011-03-07CWS-TOOLING: integrate CWS jsc340ooo/DEV300_m106ooo/DEV300_m105ooo/DEV300_m104ooo/DEV300_m103ooo/DEV300_m102Ivo Hinkelmann91-976/+1455
2011-03-03jsc340: i114609: no visibility compiler flag for jni libJuergen Schmidt3-2/+20
2011-03-02Remove "using namespace ::rtl"LO-BASE-INTEGRATION-DEV300_M101gr2Julien Nabet7-9/+19
2011-03-01jsc340: i114609: move generated component services rdbJuergen Schmidt1-1/+1
2011-03-01jsc340: i114609: adapt examples to work with the URE and use the passive ↵Juergen Schmidt5-25/+7
registration
2011-03-01jsc340: i114609: adapt examples to work with the URE and use the passive ↵Juergen Schmidt4-5/+5
registration
2011-02-28jsc340: i114609: adapt examples to work with the URE and use the passive ↵Juergen Schmidt8-216/+172
registration
2011-02-24jsc340: merge to dev300m101Juergen Schmidt3-41/+14
2011-02-23jsc340: fix problem with showing Java awt UI from the AppKit threadJuergen Schmidt1-1/+16
2011-02-23jsc340: i114609: support passive component registrationJuergen Schmidt6-30/+45
2011-02-22jsc340: i114609: support passive component registrationJuergen Schmidt8-0/+67
2011-02-22jsc340: i114609: support passive component registrationJuergen Schmidt28-332/+427
2011-02-18merged DEV300ooo/DEV300_m101Release Engineering2-7/+6
2011-02-16CWS-TOOLING: integrate CWS sb138Ivo Hinkelmann2-7/+6
2011-02-15dragonfly stuffFrancois Tigeot3-3/+8
2011-02-11fix ODK settings.mk to only set STLPORTLIB if neededRene Engelhard1-2/+6
Signed-off-by: Petr Mladek <pmladek@suse.cz>
2011-02-11Remove obsolete Hyperlink Bar from sdkAlfonso Eusebio1-2/+0
Removed code related to hyperlink bar from sdk repo.
2011-02-11sb138: merged in re/DEV300_next towards DEV300_m100sb1-34/+8
2011-02-09Trying to remove the stlport mention from the codeFridrich Štrba24-139/+32
2011-02-09Make stlport only optional dependency of postprocessFridrich Štrba1-1/+1
2011-02-08Merge remote branch 'origin/libreoffice-3-3'Jan Holesovsky0-0/+0
2011-02-07static libraries need to get linked before dynamic ones for symbol lookupbjoern.michaelsen@canonical.com1-2/+2
Signed-off-by: bjoern.michaelsen@canonical.com <Bjoern Michaelsen>