rpms/ogre/F-11 ogre-include-8958.patch,1.1,1.2

[Bruno Wolff III]

Author: bruno

Update of /cvs/pkgs/rpms/ogre/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14911

Modified Files:
	ogre-include-8958.patch 
Log Message:
Context was off, presumably because of another interviening change



ogre-include-8958.patch:
 GLX/OgreConfigDialogImp.h   |    6 +++---
 GLX/OgreErrorDialogImp.h    |    2 +-
 GLX/OgreTimerImp.h          |    2 +-
 OSX/OgreConfigDialogImp.h   |    6 +++---
 OSX/OgreErrorDialogImp.h    |    2 +-
 OSX/OgreTimerImp.h          |    2 +-
 WIN32/OgreConfigDialogImp.h |    2 +-
 gtk/OgreConfigDialogImp.h   |    6 +++---
 gtk/OgreErrorDialogImp.h    |    2 +-
 9 files changed, 15 insertions(+), 15 deletions(-)

Index: ogre-include-8958.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ogre/F-11/ogre-include-8958.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ogre-include-8958.patch	28 Nov 2009 06:05:37 -0000	1.1
+++ ogre-include-8958.patch	28 Nov 2009 06:42:01 -0000	1.2
@@ -2,7 +2,7 @@ Index: OgreMain/include/WIN32/OgreConfig
 ===================================================================
 --- OgreMain/include/WIN32/OgreConfigDialogImp.h	(revision 8957)
 +++ OgreMain/include/WIN32/OgreConfigDialogImp.h	(revision 8958)
-@@ -29,7 +29,7 @@
+@@ -29,6 +29,6 @@
  #ifndef __Win32ConfigDialog_H__
  #define __Win32ConfigDialog_H__
  
@@ -10,7 +10,6 @@ Index: OgreMain/include/WIN32/OgreConfig
 +#include "../OgrePrerequisites.h"
  
  #define WIN32_LEAN_AND_MEAN
- #define NOMINMAX // required to stop windows.h messing up std::min
 Index: OgreMain/include/OSX/OgreErrorDialogImp.h
 ===================================================================
 --- OgreMain/include/OSX/OgreErrorDialogImp.h	(revision 8957)