rpms/openoffice.org/devel workspace.vcl111.patch,1.1,1.2

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17087

Modified Files:
	workspace.vcl111.patch 
Log Message:
conflicting patches

workspace.vcl111.patch:
 source/gdi/outdev3.cxx     |    1 +
 unx/source/gdi/salgdi3.cxx |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

Index: workspace.vcl111.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.vcl111.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- workspace.vcl111.patch	27 Apr 2010 12:27:57 -0000	1.1
+++ workspace.vcl111.patch	27 Apr 2010 15:41:04 -0000	1.2
@@ -25,14 +25,3 @@ diff -r 2042f9e3d949 vcl/unx/source/gdi/
  
      psp::italic::type eItalic = psp::italic::Unknown;
      if( rFontSelData.GetSlant() != ITALIC_DONTKNOW )
-diff -r 2042f9e3d949 vcl/util/makefile.mk
---- a/vcl/util/makefile.mk	Wed Apr 14 10:05:00 2010 +0200
-+++ b/vcl/util/makefile.mk	Wed Apr 14 10:10:08 2010 +0200
-@@ -299,6 +299,7 @@
- SHL2STDLIBS=\
- 			$(VCLLIB)\
-             $(I18NPAPERLIB)     \
-+            $(I18NISOLANGLIB)     \
-             $(TOOLSLIB)         \
-             $(VOSLIB)           \
-             $(BASEGFXLIB)	\