ooo-build r12815 - in branches/ooo-build-2-4: . patches/emf+ patches/src680

[pmladek svn gnome org]

Author: pmladek
Date: Thu Jun  5 17:03:55 2008
New Revision: 12815
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12815&view=rev

Log:
2008-06-05  Petr Mladek  <pmladek suse cz>

	* patches/emf+/emf+-multipart-objects.diff, patches/src680/apply:
	  removed; it should have gone only to the ooo-build-2-4-1 branch,
	  n#385338


Removed:
   branches/ooo-build-2-4/patches/emf+/emf+-multipart-objects.diff
Modified:
   branches/ooo-build-2-4/ChangeLog
   branches/ooo-build-2-4/patches/src680/apply

Modified: branches/ooo-build-2-4/patches/src680/apply
==============================================================================
--- branches/ooo-build-2-4/patches/src680/apply	(original)
+++ branches/ooo-build-2-4/patches/src680/apply	Thu Jun  5 17:03:55 2008
@@ -2192,7 +2192,6 @@
 emf+-crash-fix.diff, n#361534, rodo
 vcl-grey-alpha-unix-sal-bitmap.diff, rodo
 cairocanvas-alpha-pixmap-rewrite.diff, rodo
-emf+-multipart-objects.diff, rodo
 
 [ TransparentPrinting ]
 # adds fixes for printing transparent content