This repository has been archived on 2023-10-09. You can view files and clone it, but cannot push or open issues or pull requests.

Brecht Van Lommel b3c238e8bc 2.5: merge with trunk, previous merge was only up to yesterday. ...

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

2008-11-12 22:03:11 +00:00

..

avi

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

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

blenkernel

2.5: merge with trunk, previous merge was only up to yesterday.

2008-11-12 22:03:11 +00:00

blenlib

Merge of trunk into blender 2.5:

2008-11-12 21:16:53 +00:00

blenloader

2.5: merge with trunk, previous merge was only up to yesterday.

2008-11-12 22:03:11 +00:00

blenpluginapi

* Minor cleanup of SCons files

2008-10-22 11:28:10 +00:00

editors

Merge of trunk into blender 2.5:

2008-11-12 21:16:53 +00:00

ftfont

Merge of trunk into blender 2.5:

2008-11-12 21:16:53 +00:00

gpu

Added a -noglsl option to disable GLSL from the command line.

2008-10-12 18:32:26 +00:00

imbuf

Merge of trunk into blender 2.5:

2008-11-12 21:16:53 +00:00

makesdna

2.5: merge with trunk, previous merge was only up to yesterday.

2008-11-12 22:03:11 +00:00

makesrna

Merge of trunk into blender 2.5:

2008-11-12 21:16:53 +00:00

nodes

2.5: merge with trunk, previous merge was only up to yesterday.

2008-11-12 22:03:11 +00:00

python

Merge of trunk into blender 2.5:

2008-11-12 21:16:53 +00:00

quicktime

Merge of trunk into blender 2.5:

2008-11-12 21:16:53 +00:00

radiosity

Merge of trunk into blender 2.5:

2008-11-12 21:16:53 +00:00

readblenfile

Merge from trunk

2008-09-19 14:15:36 +00:00

render

2.5: merge with trunk, previous merge was only up to yesterday.

2008-11-12 22:03:11 +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

Merge of trunk into blender 2.5:

2008-11-12 21:16:53 +00:00

yafray

Merge of trunk into blender 2.5:

2008-11-12 21:16:53 +00:00

CMakeLists.txt

Merge of trunk into blender 2.5:

2008-11-12 21:16:53 +00:00

Makefile

Merge of trunk into blender 2.5:

2008-11-12 21:16:53 +00:00

SConscript

Merge of trunk into blender 2.5:

2008-11-12 21:16:53 +00:00