Commit graph

20 commits

Author SHA1 Message Date
Tor Lillqvist
20ba3c4ae8 Kill OS/2 stuff 2011-04-15 14:08:09 +03:00
Norbert Thiebaud
f0e5895d5b Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
* commit 'ooo/DEV300_m101': (500 commits)
  masterfix DEV300: #i10000# remove hard dep
  masterfix DEV300: #i10000# usage of L10N build_type
  masterfix DEV300: #i10000# usage of L10N build_type
  masterfix DEV300: #i100000# dep. fix
  masterfix DEV300: #i10000# removed one hard dep
  masterfix DEV300: #i10000# fixed patch handling
  masterfix DEV300: #i10000# new configure
  DEV300
  masterfix DEV300: #i10000# nawk -> awk
  l10nmove: adjust repository handling
  l10nmove: fixed regex
  l10nmove: minor fixes
  l10nmove: add l10n repo to gb_REPOS
  DEV300 masterfix: gnumake3: subsequenttests requires  in environment
  ab80: Adding changes of cws mib21, ab77, ab77run2, dr77i to dev300
  DEV300 masterfix: #i10000#: windows: more bizare hacks ...
  locales34: have a matching configure as well
  DEV300
  locales34: back out change from autoreconf
  gnumake3: JunitTest.mk: bizarre hacks to make it work on windows
  ...

Conflicts:
	configure
	configure.in
	instsetoo_native/prj/build.lst
	instsetoo_native/util/makefile.mk
	instsetoo_native/util/openoffice.lst
	instsetoo_native/util/pack.lst
	ooo.lst
	scp2/source/canvas/canvascommons.scp
	scp2/source/canvas/mtfrenderer.scp
	scp2/source/ooo/common_brand.scp
	scp2/source/ooo/directory_ooo.scp
	scp2/source/ooo/file_library_ooo.scp
	scp2/source/ooo/file_ooo.scp
	scp2/source/ooo/makefile.mk
	scp2/source/ooo/module_hidden_ooo.scp
	scp2/source/ooo/module_langpack.ulf
	scp2/source/ooo/ure.scp
	scp2/source/python/file_python.scp
	scp2/source/sdkoo/sdkoo.scp
	scp2/source/templates/module_langpack_accessories_templates.sct
	scp2/source/templates/module_langpack_accessories_templates_root.sct
	set_soenv.in
	soldep/bootstrp/appdef.cxx
	soldep/bootstrp/dep.cxx
	soldep/bootstrp/hashtbl.cxx
	soldep/bootstrp/makefile.mk
	soldep/bootstrp/minormk.cxx
	soldep/bootstrp/prj.cxx
	soldep/bootstrp/prodmap.cxx
	soldep/inc/dep.hxx
	soldep/inc/minormk.hxx
	soldep/inc/prodmap.hxx
	soldep/inc/soldep/appdef.hxx
	soldep/inc/soldep/connctr.hxx
	soldep/inc/soldep/depper.hxx
	soldep/inc/soldep/depwin.hxx
	soldep/inc/soldep/hashtbl.hxx
	soldep/inc/soldep/objwin.hxx
	soldep/inc/soldep/prj.hxx
	soldep/inc/soldep/sdtresid.hxx
	soldep/inc/soldep/soldep.hxx
	soldep/inc/soldep/soldlg.hxx
	soldep/inc/soldep/tbox.hxx
	soldep/prj/d.lst
	soldep/source/connctr.cxx
	soldep/source/depapp.hxx
	soldep/source/depper.cxx
	soldep/source/depwin.cxx
	soldep/source/makefile.mk
	soldep/source/objwin.cxx
	soldep/source/soldep.cxx
	soldep/source/soldlg.cxx
	soldep/source/soldlg.src
	soldep/source/tbox.cxx
	solenv/bin/build.pl
	solenv/bin/cws.pl
	solenv/bin/make_installer.pl
	solenv/bin/mhids.pl
	solenv/bin/modules/CwsConfig.pm
	solenv/bin/modules/RepositoryHelper.pm
	solenv/bin/modules/installer/regmerge.pm
	solenv/bin/modules/installer/scriptitems.pm
	solenv/bin/modules/installer/servicesfile.pm
	solenv/bin/modules/installer/simplepackage.pm
	solenv/bin/modules/installer/substfilenamefiles.pm
	solenv/config/ssolar.cmn
	solenv/inc/_tg_rslb.mk
	solenv/inc/extension_post.mk
	solenv/inc/libs.mk
	solenv/inc/minor.mk
	solenv/inc/postset.mk
	solenv/inc/settings.mk
	solenv/inc/tg_rslb.mk
	solenv/inc/unxlng.mk
	solenv/inc/wntmsc.mk
	soltools/HIDCompiler/hidclex.l
	stlport/prj/d.lst
	stlport/systemstlguards/postextstl.h
2011-03-08 19:43:29 -06:00
Caolán McNamara
de58ebee9c add modelines to .h files as well 2010-10-28 15:47:03 +01:00
Povilas Kanapickas
9a5e21b208 remove non-compiled code 2010-10-18 15:39:01 +01:00
sb
c096e86385 sb129: #i113189# change UNO components to use passive registration 2010-09-10 13:10:07 +02:00
Jens-Heiner Rechtien
f281d77a21 changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision) 2010-02-12 15:01:35 +01:00
Oliver Bolte
6877f31298 INTEGRATION: CWS os2port03 (1.7.630); FILE MERGED
2008/07/16 12:20:22 obr 1.7.630.2: RESYNC: (1.7-1.8); FILE MERGED
2008/01/14 17:25:27 ydario 1.7.630.1: define version also for os2.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:52:47 +00:00
Rüdiger Timm
20e9b2072f INTEGRATION: CWS changefileheader (1.7.730); FILE MERGED
2008/03/28 15:56:00 rt 1.7.730.1: #i87441# Change license header to LPGL v3.
2008-04-10 16:55:54 +00:00
Jens-Heiner Rechtien
663c931010 INTEGRATION: CWS ause081 (1.1.1486); FILE MERGED
2007/06/22 09:53:43 hjs 1.1.1486.1: #i78393# remove component_getDescriptionFunc from exports
2007-06-26 16:38:53 +00:00
Vladimir Glazounov
3bf123129e INTEGRATION: CWS mhu13 (1.1.2); FILE ADDED
2006/10/17 08:29:19 mhu 1.1.2.1: #i70488# Mark application stacks non-executable.
2006-11-01 13:07:38 +00:00
Jens-Heiner Rechtien
34b349a489 INTEGRATION: CWS warnings01 (1.6.28); FILE MERGED
2006/02/28 12:49:35 sb 1.6.28.1: #i53898# Made code waring-free.
2006-06-19 16:18:25 +00:00
Rüdiger Timm
f50c570555 INTEGRATION: CWS ooo19126 (1.5.704); FILE MERGED
2005/09/05 14:34:14 rt 1.5.704.1: #i54170# Change license header: remove SISSL
2005-09-08 09:03:40 +00:00
Jens-Heiner Rechtien
eb62b06be2 MWS_SRX644: migrate branch mws_srx644 -> HEAD 2003-03-27 10:48:49 +00:00
Jens-Heiner Rechtien
09f8131104 #65293#: syntax 2002-04-16 09:33:27 +00:00
Hans-Joachim Lankenau
b7502ce48f static struct instead of malloc() 2002-04-15 11:14:17 +00:00
Hans-Joachim Lankenau
8a54721ec1 removed include of stdlib.h 2002-03-07 16:24:11 +00:00
Hans-Joachim Lankenau
18c6326f98 #65293# it's C code - name it so 2002-03-07 13:02:37 +00:00
Jörg Budischewski
4b6342bc3d #91714# add default map-files for wellformed components 2001-08-29 15:52:14 +00:00
Juergen Schmidt
bdaf477e96 changes for new module-description.dtd 2001-03-08 07:49:18 +00:00
Hans-Joachim Lankenau
515721a9b6 default library description 2000-10-30 12:04:52 +00:00