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

[tml svn gnome org]

Author: tml
Date: Fri Nov 28 13:04:42 2008
New Revision: 14634
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14634&view=rev

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

	* patches/dev300/apply: config_office-gio-vs-gnome-vfs.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 13:04:42 2008
@@ -1058,10 +1058,10 @@
 # fixes parallel build
 svtools-build-dep.diff, i#94339, pmladek
 
-[ BuildBits ]
 # do not allow to enable GIO and GNOME VFS at once
 config_office-gio-vs-gnome-vfs.diff, i#95713, pmladek
 
+[ BuildBits ]
 # call g_type_init() before using GIO;
 # avoid crash when using GIO in non-GNOME Window manager
 ucb-gio-gnome-init.diff, i#96170, n#442678, mmeeks