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

[rengelhard svn gnome org]

Author: rengelhard
Date: Wed May 21 08:31:11 2008
New Revision: 12616
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12616&view=rev

Log:
        * patches/dev300/apply: apply integrated speed-pagein-sort.diff only
          for < dev300-m14


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

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed May 21 08:31:11 2008
@@ -155,8 +155,12 @@
 
 # Pagein types.rdb / services.rdb & the ui files
 speed-pagein.diff, i#57679, michael
+
+[ TemporaryHacks < dev300-m14 ]
 # Sort the pagin information by inode number to improve read linearity
 speed-pagein-sort.diff, i#81912, michael
+
+[ TemporaryHacks ]
 # Use d_type entry when possible to get file type instead of using stat
 speed-getfilestatus-dtype.diff, rodo, i#63159