Bjoern Michaelsen 57272eaaf5 Merge commit 'f9d40c2b591215b57ece4ba6e623b7808a7ae717' into feature/gsoc2011_wizards ... Conflicts: wizards/com/sun/star/wizards/common/Resource.java merged resolved as per: e52421bc118e9c5f3fce5a32ba9efdcad7627d92 9e91dbca08056fc31f388f5642fdfa3d2b910990 in the old components repository merging the corresponding commit 3b4fe490441f9f77829bc6c1ae30d79a4d50255b there		2011-08-18 02:27:27 +02:00
..
helpids.h	Merge commit 'f9d40c2b591215b57ece4ba6e623b7808a7ae717' into feature/gsoc2011_wizards	2011-08-18 02:27:27 +02:00
hidother.src	Merge commit 'f9d40c2b591215b57ece4ba6e623b7808a7ae717' into feature/gsoc2011_wizards	2011-08-18 02:27:27 +02:00
makefile.mk	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
soffice.lnk
target.pmk	Clean up makefiles	2011-02-02 12:06:11 +01:00