Campbell Barton da8a7928c9 svn merge ^/trunk/blender -r41230:41266

2011-10-24 23:06:27 +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 ^/trunk/blender -r41230:41266

2011-10-24 23:06:27 +00:00

blenlib

svn merge ^/trunk/blender -r41230:41266

2011-10-24 23:06:27 +00:00

blenloader

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

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

blenpluginapi

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

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

bmesh

Add some validation checking and fix a bug in bmesh_[cut|splice][edge|vert] (used by vertex ripping)

2011-10-23 22:21:55 +00:00

collada

Remove some more $Id$ that still were left after r41227 and r41228.

2011-10-23 19:01:59 +00:00

editors

svn merge ^/trunk/blender -r41230:41266

2011-10-24 23:06:27 +00:00

gpu

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

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

ikplugin

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

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

imbuf

svn merge ^/trunk/blender -r41230:41266

2011-10-24 23:06:27 +00:00

makesdna

svn merge ^/trunk/blender -r41230:41266

2011-10-24 23:06:27 +00:00

makesrna

svn merge ^/trunk/blender -r41230:41266

2011-10-24 23:06:27 +00:00

modifiers

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

2011-10-24 12:43:08 +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

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

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

quicktime

Fix for commit 41227 (Some opening comment tags (/*) were lost!).

2011-10-23 19:39:20 +00:00

render

svn merge ^/trunk/blender -r41230:41266

2011-10-24 23:06:27 +00:00

windowmanager

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

2011-10-24 12:43:08 +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