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

[tml svn gnome org]

Author: tml
Date: Fri Nov 28 12:57:53 2008
New Revision: 14632
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14632&view=rev

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

	* patches/dev300/apply: sfx2-remove-check-update-on-fileload.diff
	doesn't apply on dev300-m36, bypass until patch author fixes.



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

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Nov 28 12:57:53 2008
@@ -878,8 +878,14 @@
 # Remove unnecessary popups that might show up during startup.
 
 # remove updater code that is only relevant for the upstream version.
+
+[ PopupRemoval < dev300-m36 ]
+# FIXME 2008-11-28: kohei, please check what has happened to the
+# affected code in dev300-m36, at least the file
+# sfx2/source/dialog/newerverwarn.cxx is not there any longer
 sfx2-remove-check-update-on-fileload.diff, kohei
 
+[ PopupRemoval ]
 # prevent the registration dialog from showing up on startup.
 desktop-disable-startup-registration.diff, kohei