diff options
author | Michael Meeks <michael.meeks@suse.com> | 2012-11-19 19:45:04 +0000 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2012-11-21 14:52:11 +0000 |
commit | f78a2bcce88dd5c12052ae3e55c561cdd48b05fe (patch) | |
tree | e56530808fd0e0ec6cfa1eb58339c8cd467854f0 /sal/Package_inc.mk | |
parent | e5111574fd904b38a3980ca4ea3d21cfcb22dea6 (diff) |
re-base on ALv2 code. Includes:
Patch contributed by Herbert Duerr:
#i118662# remove berkeleyDB from module xmlhelp (author=orwitt)
http://svn.apache.org/viewvc?view=revision&revision=1213188
#i119141# remove ISCII converter for now
http://svn.apache.org/viewvc?view=revision&revision=1306246
make exceptions for cppunittester verbose
http://svn.apache.org/viewvc?view=revision&revision=1174831
Patches contributed by Pedro Giffuni:
Avoid some uses of non portable #!/bin/bash in shell scripts.
http://svn.apache.org/viewvc?view=revision&revision=1235297
Patch contributed by Oliver-Rainer Wittmann
88652: applied patch, remove unicows deps
http://svn.apache.org/viewvc?view=revision&revision=1177585
drop OS/2 code, remove in-line assembler ARM atomics,
and obsolete armarch header.
Diffstat (limited to 'sal/Package_inc.mk')
-rw-r--r-- | sal/Package_inc.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sal/Package_inc.mk b/sal/Package_inc.mk index 7ed1a9b873cb..1c19b63087d4 100644 --- a/sal/Package_inc.mk +++ b/sal/Package_inc.mk @@ -28,7 +28,6 @@ $(eval $(call gb_Package_Package,sal_inc,$(SRCDIR)/sal/inc)) $(eval $(call gb_Package_add_file,sal_inc,inc/protectorfactory.hxx,cppunittester/protectorfactory.hxx)) -$(eval $(call gb_Package_add_file,sal_inc,inc/osl/armarch.h,osl/armarch.h)) $(eval $(call gb_Package_add_file,sal_inc,inc/osl/conditn.h,osl/conditn.h)) $(eval $(call gb_Package_add_file,sal_inc,inc/osl/conditn.hxx,osl/conditn.hxx)) $(eval $(call gb_Package_add_file,sal_inc,inc/osl/diagnose.h,osl/diagnose.h)) |