merge with trunk/2.5 at r23876

[[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
parent 36bb566d4e
commit 8f788c64db
1313 changed files with 104799 additions and 120780 deletions
--- a/intern/string/make/msvc_9_0/string.vcproj
+++ b/intern/string/make/msvc_9_0/string.vcproj
@@ -118,6 +118,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\.."
 				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"