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

[tml svn gnome org]

Author: tml
Date: Wed Aug  6 16:54:20 2008
New Revision: 13488
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13488&view=rev

Log:
2008-08-06  Tor Lillqvist  <tml novell com>

	* patches/dev300/apply: Apply config_office-disable-atl.diff only
	for [ < dev300-m29 < ooo300-m1 ].



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

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Aug  6 16:54:20 2008
@@ -2345,8 +2345,10 @@
 [ Fixes >= dev300-m29 >= ooo300-m1]
 config_office-msvc-compat.diff, thorsten
 
-[ Fixes ]
+[ Fixes < dev300-m29 < ooo300-m1 ]
 config_office-disable-atl.diff, thorsten
+
+[ Fixes ]
 xmlsecurity-disable-moz.diff, thorsten
 solenv-paths.diff, caolan
 cairocanvas-colorspace-fix.diff, thorsten