Merged changes in the trunk up to revision 36551.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 9 May 2011 01:38:29 +0000 (01:38 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 9 May 2011 01:38:29 +0000 (01:38 +0000)
Conflicts resolved:
source/creator/SConscript

18 files changed:
1  2 
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/object.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_scene.c
source/blender/render/CMakeLists.txt
source/creator/CMakeLists.txt
source/creator/SConscript
source/creator/creator.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 96899489c1f85c88508a1a820d8028d36904811c,79e03c8dddc03f3ffcaf13c2ab62a2021a6f04c1..28dc7c1a7368b2e3a0c3516336b2ac7eed3fe2ec
@@@ -7,8 -7,8 +7,9 @@@ sources = 'creator.c
  incs = '#/intern/guardedalloc ../blender/blenlib ../blender/blenkernel'
  incs += ' ../blender/editors/include ../blender/blenloader ../blender/imbuf'
  incs += ' ../blender/renderconverter ../blender/render/extern/include ../blender/windowmanager'
- incs += ' ../blender/makesdna ../blender/makesrna ../kernel/gen_messaging'
- incs += ' ../kernel/gen_system #/extern/glew/include ../blender/gpu ../blender/freestyle'
+ incs += ' ../blender/makesdna ../blender/makesrna'
+ incs += ' ../gameengine/BlenderRoutines #/extern/glew/include ../blender/gpu'
++incs += ' ../blender/freestyle'
  incs += ' ' + env['BF_OPENGL_INC']
  
  defs = []
Simple merge