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

[pflin svn gnome org]

Author: pflin
Date: Fri Dec 12 11:35:22 2008
New Revision: 14833
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14833&view=rev

Log:
2008-12-12  Fong Lin  <pflin novell com>
	* patches/vba/store-install.diff: revert for vba-word-support.diff is
    disabled.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/store-install.diff

Modified: trunk/patches/dev300/store-install.diff
==============================================================================
--- trunk/patches/dev300/store-install.diff	(original)
+++ trunk/patches/dev300/store-install.diff	Fri Dec 12 11:35:22 2008
@@ -96,6 +96,15 @@
 # 
 # .IF "$(LOCALPYFILES)"!=""
 # .IF "$(PKGFORMAT)"==""
+--- oovbaapi/util/makefile.mk	2007-07-05 12:07:16.000000000 +0100
++++ oovbaapi-patched/util/makefile.mk	2007-07-05 12:43:12.000000000 +0100
+@@ -57,5 +57,5 @@ UNOIDLDBFILES= \
+ 	$(UCR)$/constants.db
+ 
+ # --- Targets ------------------------------------------------------
+-
++REGMERGEFLAGS=-i
+ .INCLUDE :  target.mk
 diff -rup udkapi-orig/util/makefile.mk udkapi/util/makefile.mk
 --- udkapi-orig/util/makefile.mk        2008-09-03 13:23:25.000000000 +0200
 +++ udkapi/util/makefile.mk     2008-09-03 13:21:01.000000000 +0200