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

[rengelhard svn gnome org]

Author: rengelhard
Date: Wed Dec  3 19:52:12 2008
New Revision: 14727
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14727&view=rev

Log:
2008-12-03  Rene Engelhard  <rene debian org>

        * merge from ooo-build-3-0:

          patches/dev300/sfx2-remove-check-update-on-fileload.diff: adapt to ooo680-m12



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

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