ooo-build r11245 - in branches/ooo-build-2-3: . patches/src680

[rengelhard svn gnome org]

Author: rengelhard
Date: Fri Jan 11 14:37:53 2008
New Revision: 11245
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11245&view=rev

Log:
merge from trunk:

2008-01-11  Rene Engelhard  <rene debian org>

        * patches/src680/apply,
          patches/src680/ooo84684.vcl.fixfontconfig.diff: import patch from
          Fedora to fix #i84684



Added:
   branches/ooo-build-2-3/patches/src680/ooo84684.vcl.fixfontconfig.diff
      - copied unchanged from r11243, /trunk/patches/src680/ooo84684.vcl.fixfontconfig.diff
Modified:
   branches/ooo-build-2-3/ChangeLog
   branches/ooo-build-2-3/patches/src680/apply

Modified: branches/ooo-build-2-3/patches/src680/apply
==============================================================================
--- branches/ooo-build-2-3/patches/src680/apply	(original)
+++ branches/ooo-build-2-3/patches/src680/apply	Fri Jan 11 14:37:53 2008
@@ -221,6 +221,7 @@
 
 [ FontConfigTemporaryHacks ]
 cws-gfbfcfg.diff, i#54603
+ooo84684.vcl.fixfontconfig.diff
 
 # for mixed font set
 font_list_box_cjk.diff, i#73003, Fong Lin