copied across changes which were missed by merging.

2011-05-09 02:45:52 +00:00
parent 6ef77cf95a
commit 14a2330d7b
138 changed files with 156 additions and 22164 deletions
--- a/intern/string/SConscript
+++ b/intern/string/SConscript
@@ -11,4 +11,3 @@ if env['WITH_BF_CXX_GUARDEDALLOC']:
    incs += ' #intern/guardedalloc'

 env.BlenderLib ('bf_intern_string', sources, Split(incs), defs, libtype=['intern','player'], priority = [50,10] )
-