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

[tml svn gnome org]

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

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

	* patches/dev300/apply: gnome-fpicker-main-thread.diff is in
	dev300-m36.



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

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Nov 28 15:02:10 2008
@@ -2709,7 +2709,11 @@
 
 [ Fixes ]
 #sw-import-TOC.diff ,n#404254, Amelia Wang
+
+[ Fixes < dev300-m36 ]
 gnome-fpicker-main-thread.diff, i#93366, cmc
+
+[ Fixes ]
 jurt-jnilib-deliver.diff, i#93516, thorsten
 solenv-silent-mac-build.diff, thorsten
 # FIXME 2008-11-26: doesn't apply to dev300-m35, fix for the problem already there?