Tamito Kajiyama 94ae0232b0 Merged changes in the trunk up to revision 53729. ...

Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenloader/intern/readfile.c

2013-01-12 02:02:53 +00:00

..

audaspace

Added GPL header to sconscripts!

2012-12-17 08:01:43 +00:00

bsp

Added GPL header to sconscripts!

2012-12-17 08:01:43 +00:00

container

Added GPL header to sconscripts!

2012-12-17 08:01:43 +00:00

cycles

Merged changes in the trunk up to revision 53729.

2013-01-12 02:02:53 +00:00

dualcon

Added GPL header to sconscripts!

2012-12-17 08:01:43 +00:00

elbeem

Added GPL header to sconscripts!

2012-12-17 08:01:43 +00:00

ffmpeg

style cleanup: tabs & whitespace

2012-11-03 15:35:03 +00:00

ghost

Mac HiDPI support:

2013-01-09 11:25:16 +00:00

guardedalloc

Ambient occlusion baker from multi-resolution mesh

2012-12-18 17:46:42 +00:00

iksolver

Added GPL header to sconscripts!

2012-12-17 08:01:43 +00:00

itasc

Added GPL header to sconscripts!

2012-12-17 08:01:43 +00:00

locale

Add try/catch around i18n locale setter code, just in case...

2012-12-31 12:12:50 +00:00

memutil

Added GPL header to sconscripts!

2012-12-17 08:01:43 +00:00

mikktspace

Added GPL header to sconscripts!

2012-12-17 08:01:43 +00:00

moto

Added GPL header to sconscripts!

2012-12-17 08:01:43 +00:00

opencolorio

Style cleanup in OCIO area

2013-01-08 20:55:07 +00:00

opennl

Added GPL header to sconscripts!

2012-12-17 08:01:43 +00:00

raskter

Added GPL header to sconscripts!

2012-12-17 08:01:43 +00:00

smoke

add option WITH_SYSTEM_BULLET to link against the bullet installation found on the system.

2013-01-03 00:23:52 +00:00

string

Added GPL header to sconscripts!

2012-12-17 08:01:43 +00:00

utfconv

Added GPL header to sconscripts!

2012-12-17 08:01:43 +00:00

CMakeLists.txt

Replacing gettext i18n backend by boost::locale one.

2012-11-11 16:54:26 +00:00

SConscript

Added GPL header to sconscripts!

2012-12-17 08:01:43 +00:00