ooo-build r14650 - trunk/patches/dev300

[tml svn gnome org]

Author: tml
Date: Fri Nov 28 14:51:06 2008
New Revision: 14650
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14650&view=rev

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

	* patches/dev300/apply
	* patches/dev300/ui-desktop-integration.diff
	* patches/dev300/ui-desktop-integration-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 14:51:06 2008
@@ -2539,7 +2539,11 @@
 internal-mesa-headers-mesa.diff, fridrich
 
 
-[ Lockdown ]
+[ Lockdown < dev300-m36 ]
+# Disable UI [toolbars, menus] customization
+ui-desktop-integration-m35.diff, michael
+
+[ Lockdown >= dev300-m36 ]
 # Disable UI [toolbars, menus] customization
 ui-desktop-integration.diff, michael