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.

Martin Poirier 7a2e62f676 merge -r17224:17860 ...

Remaining conflicts for Aligorith to solve:

source/blender/blenkernel/BKE_blender.h
source/blender/include/transform.h
source/blender/makesdna/DNA_armature_types.h
source/blender/src/editarmature.c
source/blender/blenloader/intern/readfile.c

2008-12-15 00:25:38 +00:00

..

bFTGL

merge -r17224:17860

2008-12-15 00:25:38 +00:00

binreloc

Set linking priority of libbinreloc to 226 for blenderplayer. Why?

2008-02-15 16:52:20 +00:00

bullet2

merge -r17224:17860

2008-12-15 00:25:38 +00:00

glew

merge -r17224:17860

2008-12-15 00:25:38 +00:00

libopenjpeg

merge -r17224:17860

2008-12-15 00:25:38 +00:00

libredcode

merge -r17224:17860

2008-12-15 00:25:38 +00:00

make

merge -r17224:17860

2008-12-15 00:25:38 +00:00

ode

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

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

qhull

merge -r17224:17860

2008-12-15 00:25:38 +00:00

solid

merge -r17224:17860

2008-12-15 00:25:38 +00:00

verse

merge -r17224:17860

2008-12-15 00:25:38 +00:00

CMakeLists.txt

Merge of apricot branch game engine changes into trunk, excluding GLSL.

2008-06-17 10:27:34 +00:00

Makefile

merge -r17224:17860

2008-12-15 00:25:38 +00:00

SConscript

Disable building of fftw

2008-10-01 17:02:38 +00:00