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

[tml svn gnome org]

Author: tml
Date: Fri Nov 28 14:49:54 2008
New Revision: 14649
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14649&view=rev

Log:
2008-11-28  Tor Lillqvist  <tml novell com>

	* patches/dev300/apply
	* patches/dev300/ui-desktop-integration.diff
	* patches/dev300/ui-desktop-integration-m35.diff: Differentiate
	for m35 vs. m36 and later.



Added:
   trunk/patches/dev300/ui-desktop-integration-m35.diff
      - copied unchanged from r14648, /trunk/patches/dev300/ui-desktop-integration.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/ui-desktop-integration.diff

Modified: trunk/patches/dev300/ui-desktop-integration.diff
==============================================================================
--- trunk/patches/dev300/ui-desktop-integration.diff	(original)
+++ trunk/patches/dev300/ui-desktop-integration.diff	Fri Nov 28 14:49:54 2008
@@ -206,7 +206,7 @@
 @@ -155,6 +155,7 @@
  #include <svtools/menuoptions.hxx>
  #include <svtools/cmdoptions.hxx>
- #include <comphelper/uieventslogger.hxx>
+ #include <dispatch/uieventloghelper.hxx>
 +#include <svtools/miscopt.hxx>
  
  //_________________________________________________________________________________________________________________