diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-10-28 23:02:10 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-10-28 23:02:10 +0200 |
| commit | 83d7b776fba6a9b6be8e52f221b237b49ff7612d (patch) | |
| tree | 204f94243b92698fa07d3859d7336a3730f626fd /basic/prj/d.lst | |
| parent | e02ccd1ae444b8bd21e963adc9f368c462fc3609 (diff) | |
| parent | da622616ce54d5c5b4e2e299fbf0a8ae527fd413 (diff) | |
CWS gnumake: resync to m91; conflicts unresolved
Diffstat (limited to 'basic/prj/d.lst')
| -rw-r--r-- | basic/prj/d.lst | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/basic/prj/d.lst b/basic/prj/d.lst index ee5aae9acbf2..52f4afe902c0 100644 --- a/basic/prj/d.lst +++ b/basic/prj/d.lst @@ -24,3 +24,39 @@ mkdir: %_DEST%\inc%_EXT%\basic ..\inc\basic\*.hrc %_DEST%\inc%_EXT%\basic\*.hrc ..\inc\basic\*.h %_DEST%\inc%_EXT%\basic\*.h +<<<<<<< local +======= +..\inc\basic\sbdef.hxx %_DEST%\inc%_EXT%\basic\sbdef.hxx +..\inc\basic\sbmod.hxx %_DEST%\inc%_EXT%\basic\sbmod.hxx +..\inc\basic\sbjsmod.hxx %_DEST%\inc%_EXT%\basic\sbjsmod.hxx +..\inc\basic\sbmeth.hxx %_DEST%\inc%_EXT%\basic\sbmeth.hxx +..\inc\basic\sbprop.hxx %_DEST%\inc%_EXT%\basic\sbprop.hxx +..\inc\basic\sbstar.hxx %_DEST%\inc%_EXT%\basic\sbstar.hxx +..\inc\basic\sbuno.hxx %_DEST%\inc%_EXT%\basic\sbuno.hxx +..\inc\basic\basmgr.hxx %_DEST%\inc%_EXT%\basic\basmgr.hxx +..\inc\basic\sberrors.hxx %_DEST%\inc%_EXT%\basic\sberrors.hxx +..\inc\basic\basrdll.hxx %_DEST%\inc%_EXT%\basic\basrdll.hxx +..\inc\basic\sbstdobj.hxx %_DEST%\inc%_EXT%\basic\sbstdobj.hxx +..\inc\basic\process.hxx %_DEST%\inc%_EXT%\basic\process.hxx +..\inc\basic\mybasic.hxx %_DEST%\inc%_EXT%\basic\mybasic.hxx +..\inc\basic\testtool.hxx %_DEST%\inc%_EXT%\basic\testtool.hxx +..\inc\basic\basicrt.hxx %_DEST%\inc%_EXT%\basic\basicrt.hxx +..\inc\basic\dispdefs.hxx %_DEST%\inc%_EXT%\basic\dispdefs.hxx +..\inc\basic\ttstrhlp.hxx %_DEST%\inc%_EXT%\basic\ttstrhlp.hxx + +..\inc\basic\sbx.hxx %_DEST%\inc%_EXT%\basic\sbx.hxx +..\inc\basic\sbxcore.hxx %_DEST%\inc%_EXT%\basic\sbxcore.hxx +..\inc\basic\sbxdef.hxx %_DEST%\inc%_EXT%\basic\sbxdef.hxx +..\inc\basic\sbxform.hxx %_DEST%\inc%_EXT%\basic\sbxform.hxx +..\inc\basic\sbxmeth.hxx %_DEST%\inc%_EXT%\basic\sbxmeth.hxx +..\inc\basic\sbxobj.hxx %_DEST%\inc%_EXT%\basic\sbxobj.hxx +..\inc\basic\sbxprop.hxx %_DEST%\inc%_EXT%\basic\sbxprop.hxx +..\inc\basic\sbxvar.hxx %_DEST%\inc%_EXT%\basic\sbxvar.hxx +..\inc\basic\sbxbase.hxx %_DEST%\inc%_EXT%\basic\sbxbase.hxx +..\inc\basic\sbxfac.hxx %_DEST%\inc%_EXT%\basic\sbxfac.hxx +..\inc\basic\sbxmstrm.hxx %_DEST%\inc%_EXT%\basic\sbxmstrm.hxx + +..\inc\basic\basicmanagerrepository.hxx %_DEST%\inc%_EXT%\basic\basicmanagerrepository.hxx +..\inc\modsizeexceeded.hxx %_DEST%\inc%_EXT%\basic\modsizeexceeded.hxx +..\%__SRC%\misc\sb.component %_DEST%\xml%_EXT%\sb.component +>>>>>>> other |