Tamito Kajiyama 9e93fc1e8a Merged changes in the trunk up to revision 44612. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/bmesh.h

2012-03-03 01:43:44 +00:00

..

intern

Merged changes in the trunk up to revision 44612.

2012-03-03 01:43:44 +00:00

BLO_readfile.h

style cleanup

2012-03-02 16:05:54 +00:00

BLO_runtime.h

unify include guard defines, __$FILENAME__

2012-02-17 18:59:41 +00:00

BLO_soundfile.h

unify include guard defines, __$FILENAME__

2012-02-17 18:59:41 +00:00

BLO_sys_types.h

unify include guard defines, __$FILENAME__

2012-02-17 18:59:41 +00:00

BLO_undofile.h

unify include guard defines, __$FILENAME__

2012-02-17 18:59:41 +00:00

BLO_writefile.h

Code Cleanup: remove non existing function declarations.

2012-02-29 15:00:37 +00:00

CMakeLists.txt

Added Record run no gaps timecode for movie clips.

2011-12-21 11:01:08 +00:00

SConscript

svn merge ^/trunk/blender -r42778:42839

2011-12-23 08:41:53 +00:00