diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:36 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:36 +0100 |
| commit | 11cdc4ccc4ae58437ded5aef40df1276220edc2c (patch) | |
| tree | 7e367cf5e21e93532d69126eadac3090e1d33a1a /odk/util | |
| parent | f03de39457c663e88592899ebda0f07c4e24aa9c (diff) | |
| parent | 33e2b11638c87ffed5d91405ba76cb00cd91e1be (diff) | |
Merge commit 'ooo/DEV300_m103'
Conflicts:
odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
odk/examples/cpp/complextoolbarcontrols/exports.cxx
odk/examples/cpp/counter/countermain.cxx
odk/examples/cpp/remoteclient/remoteclient.cxx
odk/settings/settings.mk
Diffstat (limited to 'odk/util')
| -rw-r--r-- | odk/util/check.pl | 2 | ||||
| -rw-r--r-- | odk/util/makefile.pmk | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/odk/util/check.pl b/odk/util/check.pl index 6bf3fdd62b2f..490210c382b8 100644 --- a/odk/util/check.pl +++ b/odk/util/check.pl @@ -347,7 +347,9 @@ if (-d "$StartDir") { "animations", "auth", "awt", + "awt/tab", "awt/tree", + "awt/grid", "beans", "bridge", "bridge/oleautomation", diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk index d198d31ea6a2..d6d1f997651a 100644 --- a/odk/util/makefile.pmk +++ b/odk/util/makefile.pmk @@ -26,7 +26,7 @@ #************************************************************************* # used for sdk common files -PRODUCT_RELEASE=3.3 +PRODUCT_RELEASE=3.4 OFFICENAME=OpenOffice.org SDKDIRNAME=openoffice.org$(PRODUCT_RELEASE)_sdk OFFICEPRODUCTNAME=$(OFFICENAME) $(PRODUCT_RELEASE) |