office-gobmx/wizards/source/webwizard
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
..
Bullets.xba
Common.xba
delzip
dialog.xlb
HtmlAutoPilotBasic.xba
Language.xba native349 #i115652# language independent Wizard bitmaps 2010-11-18 14:44:07 +01: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
script.xlb
webwizar.src Merge commit 'f9d40c2b591215b57ece4ba6e623b7808a7ae717' into feature/gsoc2011_wizards 2011-08-18 02:27:27 +02:00
WebWzrd.xdl CWS changehid: #i111784#: convert wizards module 2010-07-21 17:46:17 +02:00