merge with 2.5/trunk at r23271

2009-09-16 17:43:09 +00:00
parent 6b0679a399
commit deebf4f8f0
686 changed files with 43627 additions and 31602 deletions
--- a/intern/string/STR_String.h
+++ b/intern/string/STR_String.h
@@ -54,6 +54,10 @@ using namespace std;
 #include "MEM_guardedalloc.h"
 #endif

+#ifdef _WIN32
+#define stricmp _stricmp
+#endif
+
 class STR_String;

 typedef  unsigned long dword;