ooo-build r14720 - in branches/ooo-build-3-0: . patches/dev300

[brosenk svn gnome org]

Author: brosenk
Date: Wed Dec  3 19:15:06 2008
New Revision: 14720
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14720&view=rev

Log:
m12 fixes


Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/apply

Modified: branches/ooo-build-3-0/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0/patches/dev300/apply	Wed Dec  3 19:15:06 2008
@@ -281,6 +281,8 @@
 # insert Chinese forbidden characters at start or end of line into i18npool module
 cjk-insert-forbidden-characters-into-i18npool.diff, Amelia Wang
 
+
+[ CJK < ooo680-m12 ]
 i92072-textgrid-fix.diff, i#92072, Fong
 
 #[ CJKTemporaryHacks ]