[Libreoffice-commits] .: vcl/Package_inc.mk vcl/prj

[Stephan Bergmann]

 vcl/Package_inc.mk |    3 +++
 vcl/prj/d.lst      |    3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ebd8637de428edb0f805149a69905279e123ddd1
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Oct 19 13:43:39 2011 +0200

    Fold spurious vcl/prj/d.lst entries (merge conflict?) into vcl/Package_inc.mk.

diff --git a/vcl/Package_inc.mk b/vcl/Package_inc.mk
index 977d1ba..146eb67 100644
--- a/vcl/Package_inc.mk
+++ b/vcl/Package_inc.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/fixed.hxx,vcl/fixed.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/floatwin.hxx,vcl/floatwin.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/fntstyle.hxx,vcl/fntstyle.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/font.hxx,vcl/font.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/fontcapabilities.hxx,vcl/fontcapabilities.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/fontmanager.hxx,vcl/fontmanager.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/gdimtf.hxx,vcl/gdimtf.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/gfxlink.hxx,vcl/gfxlink.hxx))
@@ -125,11 +126,13 @@ $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/salbtype.hxx,vcl/salbtype.hxx)
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/salctype.hxx,vcl/salctype.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/salgtype.hxx,vcl/salgtype.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/salnativewidgets.hxx,vcl/salnativewidgets.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/scopedbitmapaccess.hxx,vcl/scopedbitmapaccess.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/scrbar.hxx,vcl/scrbar.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/seleng.hxx,vcl/seleng.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/settings.hxx,vcl/settings.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/slider.hxx,vcl/slider.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/sndstyle.hxx,vcl/sndstyle.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/solarmutex.hxx,vcl/solarmutex.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/sound.hxx,vcl/sound.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spinfld.hxx,vcl/spinfld.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spin.h,vcl/spin.h))
diff --git a/vcl/prj/d.lst b/vcl/prj/d.lst
index 16647e3..8b13789 100644
--- a/vcl/prj/d.lst
+++ b/vcl/prj/d.lst
@@ -1,4 +1 @@
-..\inc\vcl\fontcapabilities.hxx %_DEST%\inc\vcl\fontcapabilities.hxx
-..\inc\vcl\scopedbitmapaccess.hxx %_DEST%\inc\vcl\scopedbitmapaccess.hxx
-..\inc\vcl\solarmutex.hxx %_DEST%\inc\vcl\solarmutex.hxx