diff options
| author | Rafael Dominguez <venccsralph@gmail.com> | 2012-07-06 05:23:43 -0430 |
|---|---|---|
| committer | Rafael Dominguez <venccsralph@gmail.com> | 2012-07-06 05:23:43 -0430 |
| commit | 5eb74b1fcad83c605cc00e377460e0ae313d7277 (patch) | |
| tree | dae1a098290f55460e0da0a024105c1e28e19410 /svx/Package_inc.mk | |
| parent | dafa1f576482bc7a0086c353ffff0dbd594a7915 (diff) | |
| parent | fa99c1ea4f6d450cc12998d4513ed8cf77bafcc9 (diff) | |
Merge branch 'feature/template-dialog'
Conflicts:
sfx2/Library_sfx.mk
sfx2/inc/sfx2/sfxcommands.h
sfx2/inc/sfx2/sfxsids.hrc
sfx2/source/appl/appserv.cxx
svtools/Library_svt.mk
Change-Id: I4305d81cb5fd6f5192a29f85835c78f31310b0d6
Diffstat (limited to 'svx/Package_inc.mk')
| -rw-r--r-- | svx/Package_inc.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/svx/Package_inc.mk b/svx/Package_inc.mk index f5dcfb633771..2490c24e8d80 100644 --- a/svx/Package_inc.mk +++ b/svx/Package_inc.mk @@ -242,7 +242,6 @@ $(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive3d/sdrattributecr $(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3dextrude.hxx,svx/sdr/contact/viewcontactofe3dextrude.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofvirtobj.hxx,svx/sdr/contact/viewcontactofvirtobj.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3dscene.hxx,svx/sdr/contact/viewcontactofe3dscene.hxx)) -$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/objectcontacttools.hxx,svx/sdr/contact/objectcontacttools.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/objectcontact.hxx,svx/sdr/contact/objectcontact.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofpageobj.hxx,svx/sdr/contact/viewcontactofpageobj.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3dcube.hxx,svx/sdr/contact/viewcontactofe3dcube.hxx)) |