Tamito Kajiyama 70aa63306a Merged changes in the trunk up to revision 34996. ...

Conflicts resolved:
C:\bf-blender\soc-2008-mxcurioni\doc\python_api\sphinx_doc_gen.py
C:\bf-blender\soc-2008-mxcurioni\source\blender\makesrna\RNA_types.h
C:\bf-blender\soc-2008-mxcurioni\source\blender\render\SConscript

2011-02-19 23:51:18 +00:00

..

bin

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

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

datafiles

pep8 cleanup and remove unused vars/imports

2011-02-17 04:35:41 +00:00

freedesktop

== blender icon ==

2011-01-05 20:18:16 +00:00

irix-6.2-mips

correct fsf address

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

plugins

remove some paranoid NULL checks, since the pointers are used already.

2010-12-17 19:05:10 +00:00

scripts

Merged changes in the trunk up to revision 34996.

2011-02-19 23:51:18 +00:00

text

Correct report [#26139] Documentation is incorrect

2011-02-19 00:58:46 +00:00

windows

By default install to the user profile instead of Program Files. This because right now the installer

2010-12-27 12:42:51 +00:00

environment-macosx

Continue development of bfile system.

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

environment-mswindows

Continue development of bfile system.

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

environment-unix

Continue development of bfile system.

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

VERSION

Note sure if this file is used still... named it 2.56a

2011-01-04 17:53:02 +00:00