diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-10-29 15:36:30 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-10-29 15:36:30 +0200 |
| commit | 91e34e4ccc6c61d0b64d250817af7f0d2263b89e (patch) | |
| tree | 40aada24b74a727c59941b29a8a12c3ea06f0b4f /vcl/prj | |
| parent | e775b40a11ca0eab7964dacc8387367086e2b029 (diff) | |
CWS gnumake2: resolve conflicts and make sources buildable on Linux
Diffstat (limited to 'vcl/prj')
| -rw-r--r-- | vcl/prj/d.lst | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/vcl/prj/d.lst b/vcl/prj/d.lst index ae9c0364c895..bf6b36a7eaf7 100644 --- a/vcl/prj/d.lst +++ b/vcl/prj/d.lst @@ -152,7 +152,5 @@ mkdir: %_DEST%\inc%_EXT%\vcl ..\inc\vcl\helper.hxx %_DEST%\inc%_EXT%\vcl\helper.hxx ..\inc\vcl\strhelper.hxx %_DEST%\inc%_EXT%\vcl\strhelper.hxx ..\inc\vcl\lazydelete.hxx %_DEST%\inc%_EXT%\vcl\lazydelete.hxx -<<<<<<< local -======= ..\%__SRC%\misc\vcl.component %_DEST%\xml%_EXT%\vcl.component ->>>>>>> other + |