Martin Poirier 60bf5465a4 Fun stuff: conflict detection in argument parsing library (could have been useful to detect a previous bug, prevents further bugs). ...

Prints a warning in the console at runtime when filling in the arguments if conflicts exist.

2010-02-07 15:36:20 +00:00

..

blender

Fun stuff: conflict detection in argument parsing library (could have been useful to detect a previous bug, prevents further bugs).

2010-02-07 15:36:20 +00:00

blenderplayer

fixing blenderplay compiling

2010-02-04 23:03:08 +00:00

creator

Wrong text for missing format with -F

2010-02-06 16:38:53 +00:00

darwin

OS X Makefiles:

2010-01-03 20:35:13 +00:00

gameengine

Wrong argument name for scons

2010-02-07 14:59:00 +00:00

icons

this restores building on mingw with Collada support, also it restores cross compiling, thanks to Sergey Sharybin for the patch. Note that the icons for linux cross might not be committed here, if not i'll add them in another commit

2010-02-01 18:39:41 +00:00

kernel

Merge from trunk -r 22040:23000.

2009-10-19 16:20:12 +00:00

CMakeLists.txt

Undo revision 23130 which was a merge with 2.5, a messy one because I did something wrong (svn status output: http://www.pasteall.org/7887).

2009-09-15 18:01:18 +00:00

Makefile

Change order of linking slightly so things link.

2010-01-22 16:28:16 +00:00

nan_compile.mk

Drag and drop 2.5 integration! Finally, slashdot regulars can use

2010-01-26 18:18:21 +00:00

nan_definitions.mk

Drag and drop 2.5 integration! Finally, slashdot regulars can use

2010-01-26 18:18:21 +00:00

nan_link.mk

add OpenCOLLADA support to Makefiles

2010-01-10 09:11:48 +00:00

nan_subdirs.mk

Makefile updates for Blender 2.5 (from GSR)

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

nan_warn.mk

Update condition checks to match user definable CC and CCC.

2009-09-20 20:21:01 +00:00

SConscript

this restores building on mingw with Collada support, also it restores cross compiling, thanks to Sergey Sharybin for the patch. Note that the icons for linux cross might not be committed here, if not i'll add them in another commit

2010-02-01 18:39:41 +00:00