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

[rengelhard svn gnome org]

Author: rengelhard
Date: Thu Nov 13 11:03:27 2008
New Revision: 14490
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14490&view=rev

Log:
merge r14489

Added:
   trunk/patches/dev300/scripting-framework-user-path.diff
      - copied unchanged from r14489, /branches/ooo-build-3-0/patches/dev300/scripting-framework-user-path.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Nov 13 11:03:27 2008
@@ -555,6 +555,8 @@
 # the second causes problems with IBM Java 1.6.0
 jvmfwk-libjvm-path-ibm-java-1.6.0.diff, n#440459, i#95838, pmladek
 
+scripting-framework-user-path.diff, i#93994
+
 [ Fixes < dev300-m31 < ooo300-m5 ]
 # fixes the realpath buffer size to avoid crash when detecting soffice path
 cppuhelper-findsofficepath-realpath-buffer-size.diff, i#93393, pmladek