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
2005/01/04 11:13:17 bc 1.15.20.2: #i37762#helpids for fieldselection assigned
2004/12/17 11:07:18 bc 1.15.20.1: #i38832# helpindices for last page of tablewizard added
2004/10/11 16:46:21 tv 1.13.34.2: RESYNC: (1.13-1.14); FILE MERGED
2004/08/13 14:51:29 bc 1.13.34.1: #111602# hids for tablewizard and formwizard added
2004/05/06 09:34:58 bc 1.12.94.11: #111603# hiderror in webwizards iconset solved
2004/05/05 19:17:14 rpiterman 1.12.94.10: changed web wizard hids
2004/04/23 13:03:11 bc 1.12.94.9: #111603# hids for querywizard and reportwizard modified
2004/04/16 09:59:35 rpiterman 1.12.94.8: bugfix 116383: added hids for status dialog/web wizard
2004/04/14 10:50:22 bc 1.12.94.7: #111603# hids for querywizard added
2004/04/14 09:46:25 tv 1.12.94.6: added hashmark before define (syntax bugfix)
2004/04/13 14:46:53 bc 1.12.94.5: #111603# helpid for helpbuttone of QW added
2004/04/13 13:55:34 rpiterman 1.12.94.4: added web wizard hids
2004/04/13 13:33:43 tv 1.12.94.3: added help button for letterwizard
2004/03/31 11:51:22 bc 1.12.94.2: #111603# helpids for querywizard added
2004/03/30 13:33:59 tv 1.12.94.1: added second range, added LetterWizard