Commit Graph

9 Commits

Author SHA1 Message Date
11cdc4ccc4 Merge commit 'ooo/DEV300_m103'
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-23 16:59:36 +01:00
928af9414d jsc340: i114609: support passive component registration 2011-02-22 16:13:49 +01:00
e9a59da46a Add vim/emacs modelines to all source files
Fixes #fdo30794
Based on bin/add-modelines script (originally posted in mail
1286706307.1871.1399280959@webmail.messagingengine.com)

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
2010-10-13 10:58:04 +02:00
1296914c84 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
0525725dbe INTEGRATION: CWS changefileheader (1.5.98); FILE MERGED
2008/04/01 12:31:54 thb 1.5.98.1: #i85898# Stripping all external header guards
2008-04-10 15:30:40 +00:00
8afa1339fc INTEGRATION: CWS jsc14 (1.4.14); FILE MERGED
2006/10/25 08:52:23 jsc 1.4.14.1: #i70636# remove auto generated precompiled header include
2006-11-06 13:59:41 +00:00
235d9b45c1 INTEGRATION: CWS pchfix02 (1.3.260); FILE MERGED
2006/09/01 17:32:20 kaib 1.3.260.1: #i68856# Added header markers and pch files
2006-09-16 23:09:21 +00:00
4cb7f5bb03 INTEGRATION: CWS sdk04 (1.2.6); FILE MERGED
2003/06/24 13:32:29 jsc 1.2.6.1: #110313# insert source license header
2003-06-30 14:12:14 +00:00
408c308c7a INTEGRATION: CWS sdk02 (1.1.2); FILE ADDED
2003/05/09 10:41:11 jsc 1.1.2.1: #109045# insert new and remove example zip file
2003-06-10 09:11:43 +00:00