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

[tml svn gnome org]

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

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

	* patches/dev300/apply: crash-gvfs.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:07:25 2008
@@ -2796,9 +2796,11 @@
 # FIXME 2008-11-26: already in?
 #warning-spin-button.diff, i#95554, michael
 
+[ Fixes < dev300-m36 ]
 # disable gnome-vfs bits if we are not building with it enabled
 crash-gvfs.diff, i#95689, michael
 
+[ Fixes ]
 # openjdk contains rhino.jar. breaks the build...
 buildfix-openjdk-6-no-rhino.diff