Joseph Eagar dae0b7a4a2 fix merge bug, this should fix this issue for now, but might need further work later.

2009-09-04 01:28:06 +00:00

..

blender

fix merge bug, this should fix this issue for now, but might need further work later.

2009-09-04 01:28:06 +00:00

creator

merge with 2.5 at r22793

2009-08-26 10:27:04 +00:00

darwin

NaN makefiles now support and build with precompiled Python 3.1 by default on Mac

2009-08-02 06:22:53 +00:00

gameengine

compile-fix

2009-08-27 07:07:41 +00:00

icons

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

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

kernel

2.5 audio cleanup:

2009-08-10 15:39:11 +00:00

CMakeLists.txt

2.50:

2009-06-08 20:08:19 +00:00

Makefile

Update Makefiles for audaspace.

2009-08-21 22:56:26 +00:00

nan_compile.mk

forgot to updated scons and make for the bullet defines

2009-08-18 04:15:28 +00:00

nan_definitions.mk

Update Makefile and missing include on voxeldata.c

2009-08-25 21:25:41 +00:00

nan_link.mk

Remove astray tab chars.

2009-08-15 23:42:16 +00:00

nan_subdirs.mk

Makefile updates for Blender 2.5 (from GSR)

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

nan_warn.mk

Makefile updates for Blender 2.5 (from GSR)

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

SConscript

merge with 2.5 at r20307. note there were some python hacking necassary for this to work, so um hopefully there's not too much cruft from that.

2009-05-23 03:24:15 +00:00