Tamito Kajiyama 065605e0da Merged changes in the trunk up to revision 48893. ...

Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_filter.c
source/blender/makesrna/RNA_enum_types.h

2012-07-13 23:23:06 +00:00

..

freestyle

Fix for the WithinImageBorderUP1D predicate not working with a ViewEdge such that

2012-05-28 23:53:28 +00:00

modules

Small cleanup...

2012-07-09 19:33:25 +00:00

presets

Fix for [#32016] Tracking Settings Presets not working

2012-07-04 23:00:49 +00:00

startup

Merged changes in the trunk up to revision 48893.

2012-07-13 23:23:06 +00:00

templates

style cleanup

2012-07-04 21:41:05 +00:00