Commit graph

4 commits

Author SHA1 Message Date
Caolán McNamara
1f5c696c37 add mode-lines to .m files and last round of merged files, etc. 2011-09-30 09:09:25 +01:00
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
Mathias Bauer
0b00bc90e4 CWS changehid: #i111784#: convert wizards module 2010-07-21 17:46:17 +02:00
Mathias Bauer
8bf98bbf91 CWS changehid: make hidother.src easier to handle 2010-07-21 11:47:52 +02:00