ooo-build r14652 - trunk/patches/dev300

[tml svn gnome org]

Author: tml
Date: Fri Nov 28 15:00:17 2008
New Revision: 14652
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14652&view=rev

Log:
2008-11-28  Tor Lillqvist  <tml novell com>

	* patches/dev300/apply
	* patches/dev300/sw-ww8-fieldandcharstyle.diff
	* patches/dev300/sw-ww8-fieldandcharstyle-m35.diff: Differentiate
	for m35 vs. m36 and later.



Modified:
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Nov 28 15:00:17 2008
@@ -2582,8 +2582,13 @@
 
 sw-source-filter-ww8-continous-section-break-fix.diff, n#405071, i#91395, fridrich
 
+[ Fixes < dev300-m36 ]
+sw-ww8-fieldandcharstyle-m35.diff, n#414471, i#93105, fridrich
+
+[ Fixes >= dev300-m36 ]
 sw-ww8-fieldandcharstyle.diff, n#414471, i#93105, fridrich
 
+[ Fixes ]
 unoxml-boost-workaround.diff, thorsten
 
 sw-updateindex-crash.diff, n#388069, fridrich