ooo-build r15549 - in trunk: . patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Mon Mar 16 18:17:27 2009
New Revision: 15549
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15549&view=rev

Log:
2009-03-16  Rene Engelhard  <rene debian org>

        * patches/dev300/apply: smoketest21 is in ooo310-m6


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Mar 16 18:17:27 2009
@@ -346,13 +346,14 @@
 # GetDialogParent() symbol needs to be exported.
 vba-show-data-form-link-fix.diff, kohei
 
-# fix smoketest for non-epm builds
-cws-smoketest21.diff
-
 # not for upstreaming: don't disable the entire visibility, just
 # the -fvisibility-inlines-hidden
 buildfix-x86-64-visibility-workaround.diff
 
+[ CWSBackports < ooo310-m6 ]
+# fix smoketest for non-epm builds
+cws-smoketest21.diff
+
 [ CWSBackports < ooo310-m1 ]
 cws-native220.diff, i#98168