First merge with 2.5 branch.
authorArystanbek Dyussenov <arystan.d@gmail.com>
Fri, 8 May 2009 16:02:58 +0000 (16:02 +0000)
committerArystanbek Dyussenov <arystan.d@gmail.com>
Fri, 8 May 2009 16:02:58 +0000 (16:02 +0000)
commit188afe8f08eade86687247060afb005e2ba8822e
tree12c2898e3fdc8bd38e6db91aafbb880babee26e0
parentd096b68a26d0bd1e53596e78d3c8975424a02640
parentf8b929b8e2c5427a96a268c52077547d48387dba
First merge with 2.5 branch.
source/blender/editors/animation/anim_filter.c
source/blender/editors/animation/anim_markers.c
source/blender/editors/animation/keyframes_edit.c
source/blender/editors/space_action/action_edit.c
source/blender/editors/space_graph/graph_edit.c
source/gameengine/BlenderRoutines/CMakeLists.txt
source/gameengine/BlenderRoutines/SConscript