Tamito Kajiyama ed0e2fbd9f Merged changes in the trunk up to revision 52690. ...

Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenlib/intern/bpath.c

2012-12-01 02:47:59 +00:00

..

bin

…

darwin

move source/darwin into release/darwin since these files are for osx packaging.

2012-11-18 07:41:38 +00:00

datafiles

Merged changes in the trunk up to revision 52690.

2012-12-01 02:47:59 +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 52690.

2012-12-01 02:47:59 +00:00

text

Readme and Release Log Links:

2012-11-20 01:55:22 +00:00

windows

style cleanup

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

environment-macosx

…

environment-mswindows

…

environment-unix

…