Tamito Kajiyama e0df491d1e Merged changes in the trunk up to revision 43404. ...

Conflicts resolved:
source/blender/python/SConscript

2012-01-15 23:13:12 +00:00

..

intern

Merged changes in the trunk up to revision 43404.

2012-01-15 23:13:12 +00:00

BLO_readfile.h

== Cleanup of SpaceImasel ==

2011-11-01 18:27:09 +00:00

BLO_runtime.h

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

BLO_soundfile.h

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

BLO_sys_types.h

workaround for error building with clang and quiet some warnings building without libmv.

2011-12-31 03:01:18 +00:00

BLO_undofile.h

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

BLO_writefile.h

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

CMakeLists.txt

Added Record run no gaps timecode for movie clips.

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

SConscript

Added Record run no gaps timecode for movie clips.

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