From 91e34e4ccc6c61d0b64d250817af7f0d2263b89e Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 29 Oct 2010 15:36:30 +0200 Subject: CWS gnumake2: resolve conflicts and make sources buildable on Linux --- vcl/prj/d.lst | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'vcl/prj') 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 + -- cgit v1.2.3