summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-04-22Merge commit 'ooo/DEV300_m106' into libreoffice-3-4integration/dev300_m106Jan Holesovsky6-37/+59
Conflicts: swext/mediawiki/build.xml
2011-04-19Version 3.3.99.2, tag libreoffice-3.3.99.2 (3.4.0-beta2)libreoffice-3.3.99.2Petr Mladek0-0/+0
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-08fix jfreereport build with ant-1.6.5Petr Mladek1-0/+18
2011-04-05Merge remote-tracking branch 'origin/libreoffice-3-3' into libreoffice-3-4Petr Mladek7-1/+151
2011-04-04masterfix DEV300: #i10000# added mkdirooo/DEV300_m106Ivo Hinkelmann1-0/+1
2011-04-04masterfix DEV300: #i10000# build fixIvo Hinkelmann1-9/+5
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-31fix merge errorCaolán McNamara9-9/+9
2011-03-30ct2n-build.diff: allow to build the CT2N extension (fate#307906)Petr Mladek6-0/+196
2011-03-30build-ant-1.6-swext.diff: allow to build MediaWiki ext. with ant 1.6 (i#90830)Petr Mladek1-4/+4
2011-03-29drop bogus executable flag from idl/build/src and config filesFrancisco Saito2-0/+0
2011-03-29drop bogus executable flag from odf filesFrancisco Saito1-0/+0
2011-03-29CWS-TOOLING: integrate CWS ause127ooo/DEV300_m105Ivo Hinkelmann1-16/+16
2011-03-29CWS-TOOLING: integrate CWS rsvglibsIvo Hinkelmann1-0/+1
2011-03-29fix build with system jfreereportDavid Tardon4-4/+4
2011-03-29rsvglibs: rebased to DEV300_m104ka1-0/+1
2011-03-28CWS-TOOLING: integrate CWS dba34dIvo Hinkelmann2-12/+20
2011-03-28use PartialWeakComponentImplHelperX for overloaded-virtualCaolán McNamara1-5/+10
2011-03-28rsvglibs: minor adjustments wrt. new/updated external libska1-0/+1
2011-03-25set build depencencies against the new "translations" modulePetr Mladek2-2/+2
2011-03-25two NULLS in build.lstCaolán McNamara1-1/+1
2011-03-23hash_map -> unordered_mapCaolán McNamara1-1/+1
2011-03-23Merge commit 'ooo/DEV300_m103'Jan Holesovsky63-644/+1937
Conflicts: jfreereport/java/flute/makefile.mk jfreereport/java/libbase/makefile.mk jfreereport/java/libfonts/makefile.mk jfreereport/java/libformula/makefile.mk jfreereport/java/libloader/makefile.mk jfreereport/java/librepository/makefile.mk jfreereport/java/libserializer/makefile.mk jfreereport/java/libxml/makefile.mk jfreereport/java/sac/makefile.mk mysqlc/source/mysqlc_connection.cxx mysqlc/source/mysqlc_connection.hxx mysqlc/source/mysqlc_databasemetadata.cxx mysqlc/source/mysqlc_databasemetadata.hxx mysqlc/source/mysqlc_driver.cxx mysqlc/source/mysqlc_driver.hxx mysqlc/source/mysqlc_general.hxx mysqlc/source/mysqlc_preparedstatement.hxx mysqlc/source/mysqlc_resultsetmetadata.hxx mysqlc/source/mysqlc_statement.hxx sdext/source/minimizer/impoptimizer.cxx sdext/source/pdfimport/config/description.xml sdext/source/pdfimport/tree/drawtreevisiting.cxx sdext/source/presenter/PresenterWindowManager.cxx swext/prj/build.lst
2011-03-23ause127: #i117518# fix directory access rights inside zip - thanks to mavHans-Joachim Lankenau1-16/+16
2011-03-19Move OSL_ENSURE(sal_False,...) to OSL_FAIL(...)Thomas Arnhold4-6/+6
2011-03-19FALSE is no longer definedAurimas Fišeras1-1/+1
2011-03-19FALSE is no longer definedDavid Tardon1-1/+1
2011-03-18masterfix from sb140: #i117458# on Solaris 11 against Solaris 10 baseline, ↵sb1-0/+3
make sure xpdf sees baseline headers (transplanted from 5d89bbbf49f658c5a293b7a81ca1550f6cc8d3d9)
2011-03-21CWS-TOOLING: integrate CWS dba34cooo/DEV300_m104Vladimir Glazunov1-2/+15
2011-03-17Merge remote-tracking branch 'origin/integration/dev300_m101'Jan Holesovsky2-2/+2
2011-03-16Introduce a single .gitattributes file in bootstrapMiklos Vajna1-2/+0
2011-03-14dba34d: pulled and merged DEV300.m102Frank Schoenheit [fs]11-39/+311
2011-03-13l10n is conditionned on L10N:integration/dev300_m101Norbert Thiebaud2-2/+2
2011-03-12OSL_TRACE: Use format stringThomas Arnhold1-1/+1
2011-03-12Move OSL_ENSURE(0,...) to OSL_FAIL(...)Thomas Arnhold2-2/+2
2011-03-12Move OSL_ENSURE(false,...) to OSL_FAIL(...)Thomas Arnhold5-7/+7
2011-03-10Automated merge with ssh://hg@hg.services.openoffice.org/cws/dba34cOcke Janssen [oj]2-12/+20
2011-03-08l10n: don't extract strings from localized NLPSolver propertiesgr2Andras Timar39-0/+39
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-08dba34d: pulled and merged latest changes from CWS dba34cFrank Schoenheit [fs]2-2/+2
2011-03-07CWS-TOOLING: integrate CWS vcl119ooo/DEV300_m103ooo/DEV300_m102Ivo Hinkelmann11-39/+311
2011-03-06l10n: Updated translations from PootleAndras Timar6-0/+150
2011-03-04fix windows buildLO-BASE-INTEGRATION-DEV300_M101Fridrich Štrba1-1/+1
2011-03-04Automated merge with file:///d:\tools\master\oooOcke Janssen1-2/+15
2011-03-01avoid implicit castCaolán McNamara1-1/+1
2011-03-01Automated merge with file:///cws/so-cwsserv03/dba34c/DEV300/oooOcke Janssen [oj]2-12/+20
2011-02-26Remove "using namespace ::rtl"Julien Nabet4-4/+16
2011-02-26Move bogus OSL_ASSERT(msg) to OSL_FAIL(msg)Thomas Arnhold1-1/+1
2011-02-24remove empty TESTSHL2LIBCaolán McNamara1-3/+0