merge with/from trunk at r35190
[blender.git] / intern / guardedalloc / SConscript
index 74d6e07269f24732c85fe56d57b07123ccfd06c5..53b2ef775e5d6aa2267a2354226feae234d9382d 100644 (file)
@@ -12,4 +12,8 @@ if env['WITH_BF_CXX_GUARDEDALLOC']:
 
 incs = '.'
 
+<<<<<<< .working
+env.BlenderLib ('bf_intern_guardedalloc', sources, Split(incs), defines=[], libtype=['intern','player'], priority = [5,150] )
+=======
 env.BlenderLib ('bf_intern_guardedalloc', sources, Split(incs), defs, libtype=['intern','player'], priority = [5,150] )
+>>>>>>> .merge-right.r35190