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

[kyoshida svn gnome org]

Author: kyoshida
Date: Wed Dec  3 20:52:50 2008
New Revision: 14730
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14730&view=rev

Log:
2008-12-03  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/apply: reverted the change; 
	sfx2-remove-check-update-on-fileload.diff still does not apply against 
	dev300-m36.  I have yet to look into it...


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

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Dec  3 20:52:50 2008
@@ -897,7 +897,10 @@
 
 [ PopupRemoval >= dev300-m36 ]
 # remove updater code that is only relevant for the upstream version.
-sfx2-remove-check-update-on-fileload.diff, kohei
+# 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.