office-gobmx/wizards/source/importwizard
Bjoern Michaelsen e268256133 Merge branch 'master' into feature/gnumake4
Conflicts:
	lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
	lingucomponent/source/spellcheck/spell/sspellimp.cxx
	setup_native/prj/build.lst
	setup_native/prj/d.lst
	wizards/Jar_query.mk
	wizards/Module_wizards.mk
	wizards/Zip_launcher.mk
	wizards/com/sun/star/wizards/report/makefile.mk
	wizards/prj/build.lst
	wizards/prj/d.lst
	wizards/util/target.pmk
2011-06-19 12:54:22 +02:00
..
API.xba
delzip
dialog.xlb
DialogModul.xba
FilesModul.xba wizards-source-importwizard-filesmodul-xba.diff: document converter fix 2011-04-27 13:55:24 +02:00
ImportDialog.xdl CWS changehid: #i111784#: convert wizards module 2010-07-21 17:46:17 +02:00
importwi.src 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
Language.xba
Main.xba native349 #i115652# language independent Wizard bitmaps 2010-11-18 14:44:07 +01:00
script.xlb