Tamito Kajiyama 0ec378f3fe Merged changes in the trunk up to revision 34193. ...

Conflicts resolved:
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/keyframes_draw.c
source/blender/editors/animation/keyframes_edit.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/space_nla/nla_channels.c
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c

API changes resolved:
source/blender/freestyle/intern/system/PythonInterpreter.h

2011-01-09 15:07:14 +00:00

..

bin

remove redundant []'s for list comprehension's, py2.4+ supports this.

2010-09-19 07:07:14 +00:00

datafiles

Part two of 2.56 beta, VERSION for make and splash itself.

2010-12-29 19:05:58 +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 34193.

2011-01-09 15:07:14 +00:00

test

pep8 cleanup

2011-01-01 07:20:34 +00:00

text

Fixed readme.html only went to the tag branch, now in trunk.

2011-01-04 17:49:43 +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

getversion.py

pep8 cleanup

2011-01-01 07:20:34 +00:00

Makefile

Makefile fix, the getversion.py was using minor release numbers,

2010-11-29 17:23:06 +00:00

VERSION

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

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