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/source/gameengine/GamePlayer/ghost/SConscript
+++ b/source/gameengine/GamePlayer/ghost/SConscript
@@ -26,7 +26,6 @@ incs = ['.',
        '#source/blender/include',
        '#source/blender/makesdna',
        '#source/blender/makesrna',
-        '#source/gameengine/BlenderRoutines',
        '#source/gameengine/Rasterizer',
        '#source/gameengine/GameLogic',
        '#source/gameengine/Expressions',