Campbell Barton bd86ba2c88 svn merge -r41335:41371

2011-10-30 01:27:49 +00:00

..

avi

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

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

blenfont

svn merge ^/trunk/blender -r41227:41230 . --accept=theirs-full

2011-10-24 22:18:32 +00:00

blenkernel

svn merge -r41335:41371

2011-10-30 01:27:49 +00:00

blenlib

svn merge -r41335:41371

2011-10-30 01:27:49 +00:00

blenloader

svn merge -r41335:41371

2011-10-30 01:27:49 +00:00

blenpluginapi

svn merge -r41287:41310 ^/trunk/blender note, mirror modifier had slow, per vertex name flipping, replaced with flip_map from trunk

2011-10-27 09:42:03 +00:00

bmesh

style edits

2011-10-29 11:23:37 +00:00

collada

fix for compiling collada by nico_ga

2011-10-28 06:12:00 +00:00

editors

svn merge -r41335:41371

2011-10-30 01:27:49 +00:00

gpu

svn merge -r41335:41371

2011-10-30 01:27:49 +00:00

ikplugin

Fix compilation error for win32.

2011-10-25 18:13:12 +00:00

imbuf

svn merge -r41287:41310 ^/trunk/blender note, mirror modifier had slow, per vertex name flipping, replaced with flip_map from trunk

2011-10-27 09:42:03 +00:00

makesdna

svn merge -r41310:41329 ^/trunk/blender

2011-10-28 05:17:09 +00:00

makesrna

svn merge -r41335:41371

2011-10-30 01:27:49 +00:00

modifiers

svn merge -r41335:41371

2011-10-30 01:27:49 +00:00

nodes

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

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

python

replace VECCOPY and QUATCOPY with inline funcs.

2011-10-28 12:40:15 +00:00

quicktime

OSX: adapt comments to new behaviour when compiling with gcc-4.6 but GHOST and QT with default compiler

2011-10-27 15:50:51 +00:00

render

svn merge -r41310:41329 ^/trunk/blender

2011-10-28 05:17:09 +00:00

windowmanager

svn merge -r41310:41329 ^/trunk/blender

2011-10-28 05:17:09 +00:00

CMakeLists.txt

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

SConscript

remove gettext from mkaesrna, and update language packs

2011-08-11 22:14:07 +00:00