Joseph Eagar ed12e1978f pre-merge commit

2010-01-11 23:09:46 +00:00

..

blender

pre-merge commit

2010-01-11 23:09:46 +00:00

blenderplayer

align option for split

2009-12-10 14:47:07 +00:00

creator

Merge with trunk/2.5 at r25563

2010-01-05 22:33:41 +00:00

darwin

merge with trunk/2.5 at r23876

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

gameengine

Merge with trunk/2.5 at r25563

2010-01-05 22:33:41 +00:00

icons

merge with 2.5/trunk at r23271

2009-09-16 17:43:09 +00:00

kernel

merge with 2.5/trunk at r23271

2009-09-16 17:43:09 +00:00

CMakeLists.txt

merge with 2.5/trunk at r23271

2009-09-16 17:43:09 +00:00

Makefile

Some fixes to get blender compiling on solaris.

2009-12-17 17:42:26 +00:00

nan_compile.mk

Makefiles: fix CFLAGS for OS X

2009-12-21 10:40:55 +00:00

nan_definitions.mk

Add FFTW3 support to Makefiles, make OpenJpeg use OS lib for Linux.

2009-11-09 20:08:19 +00:00

nan_link.mk

OS X: added support for building with Cocoa to Makefiles

2009-12-21 10:38:04 +00:00

nan_subdirs.mk

Makefile updates for Blender 2.5 (from GSR)

2009-03-19 01:50:45 +00:00

nan_warn.mk

merge with trunk/2.5 at r23876

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

SConscript

merge with 2.5/trunk at r23271

2009-09-16 17:43:09 +00:00