Tamito Kajiyama 17ee056fc6 Merged changes in the trunk up to revision 37539. ...

Conflicts resolved:
source/blender/render/intern/source/pipeline.c

Also fixed an inconsistent conflict resolution in the last commit with
regard to release/scripts/startup/bl_ui/properties_render.py.  This
problem resulted in empty menus in the GUI.

2011-06-16 05:50:13 +00:00

..

bin

patch [#25972] blender-thumbnailer.py: GVFS support

2011-02-09 02:09:30 +00:00

datafiles

remove .Bfs, its not used anymore.

2011-04-27 13:13:07 +00:00

freedesktop

cmake - install icons into $PREFIX/share/icons/hicolor/ rather then $PREFIX/share/pixmaps/, also move blender icon into 'apps' dir.

2011-04-21 06:37:54 +00:00

irix-6.2-mips

correct fsf address

2010-02-12 13:34:04 +00:00

plugins

converted more mixed tab/space indentations to tabs. only whitespace changes.

2011-04-21 15:53:30 +00:00

scripts

Merged changes in the trunk up to revision 37539.

2011-06-16 05:50:13 +00:00

text

Readme.html and Link to Release Log:

2011-04-02 13:18:33 +00:00

windows

Fix #27481: windows uninstaller could remove files unrelated to blender

2011-06-01 13:13:55 +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