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

..

bin

Workaround for half-transparent windows when running blender-softwaregl

2011-11-15 07:28:18 +00:00

datafiles

Small tweaks from Zafio for the remesh modifier icon

2011-12-30 23:10:23 +00:00

freedesktop

synched with trunk at revision 36569

2011-05-16 20:30:59 +00:00

plugins

style edits for function declarations

2011-12-30 07:55:15 +00:00

scripts

Merged changes in the trunk up to revision 43404.

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

text

Blender 2.61 Release links and readme:

2011-11-29 20:13:20 +00:00

windows

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

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

environment-macosx

Continue development of bfile system.

2009-10-19 18:44:09 +00:00

environment-mswindows

set svn end of lines to native

2011-05-09 08:15:38 +00:00

environment-unix

Continue development of bfile system.

2009-10-19 18:44:09 +00:00