Joshua Leung 37f47ef386 NLA SoC: Merge from 2.5 20441 to 20570 (HEAD) ...

There were a few conflicts/missing files. Hopefully everything updated ok...

2009-06-02 01:40:53 +00:00

..

avi

2.5 / SCons

2008-12-23 21:20:34 +00:00

blenfont

2.5

2009-05-18 16:42:34 +00:00

blenkernel

NLA SoC: Merge from 2.5 20441 to 20570 (HEAD)

2009-06-02 01:40:53 +00:00

blenlib

2.5

2009-05-24 13:29:29 +00:00

blenloader

NLA SoC: Merge from 2.5 20441 to 20570 (HEAD)

2009-06-02 01:40:53 +00:00

blenpluginapi

2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r18677:19317

2009-03-17 21:44:58 +00:00

editors

NLA SoC: Merge from 2.5 20441 to 20570 (HEAD)

2009-06-02 01:40:53 +00:00

gpu

2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19323:HEAD

2009-04-20 15:06:46 +00:00

imbuf

Color proofing support with lcms (http://www.littlecms.com/).

2009-05-17 16:19:13 +00:00

makesdna

NLA SoC: Merge from 2.5 20441 to 20570 (HEAD)

2009-06-02 01:40:53 +00:00

makesrna

NLA SoC: Merge from 2.5 20441 to 20570 (HEAD)

2009-06-02 01:40:53 +00:00

nodes

Big, big commit!!

2009-05-05 23:10:32 +00:00

python

Needed to cast to a PyObject*

2009-05-28 10:31:56 +00:00

quicktime

2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r18677:19317

2009-03-17 21:44:58 +00:00

radiosity

2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17853:HEAD

2009-01-26 08:34:40 +00:00

readblenfile

2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17853:HEAD

2009-01-26 08:34:40 +00:00

render

2.5

2009-06-01 12:10:30 +00:00

verify

Patch from GSR that a) fixes a whole bunch of GPL/BL license

2008-04-16 22:40:48 +00:00

windowmanager

NLA SoC: Merge from 2.5 20441 to 20570 (HEAD)

2009-06-02 01:40:53 +00:00

CMakeLists.txt

2.5

2009-06-01 12:10:30 +00:00

Makefile

2.5

2009-06-01 12:10:30 +00:00

SConscript

2.5

2009-06-01 12:10:30 +00:00