Merging r51923 through r52851 from trunk into soc-2011-tomato

2012-12-10 15:18:00 +00:00
parent da24aa8d10
commit b1afaa8312
978 changed files with 32475 additions and 17107 deletions
--- a/intern/SConscript
+++ b/intern/SConscript
@@ -30,6 +30,9 @@ if env['WITH_BF_CYCLES']:
 if env['WITH_BF_BOOLEAN']:
    SConscript(['bsp/SConscript'])

+if env['WITH_BF_INTERNATIONAL']:
+    SConscript(['locale/SConscript'])
+
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-mingw', 'linuxcross', 'win64-vc'):
    SConscript(['utfconv/SConscript'])