Tamito Kajiyama 6cee7bb2b7 Merged changes in the trunk up to revision 52191. ...

Conflicts resolved:
source/blender/makesdna/DNA_scene_types.h

2012-11-14 02:01:02 +00:00

..

bin

…

datafiles

Merged changes in the trunk up to revision 51985.

2012-11-07 22:12:19 +00:00

freedesktop

patch to our desktop file from debian, German translation.

2012-04-16 09:56:12 +00:00

scripts

Merged changes in the trunk up to revision 52191.

2012-11-14 02:01:02 +00:00

text

Merged changes in the trunk up to revision 50829.

2012-09-23 18:50:56 +00:00

windows

style cleanup

2012-10-20 18:46:57 +00:00

environment-macosx

…

environment-mswindows

…

environment-unix

…