Martin Poirier 725319f771 Hotkey for outliner window was there twice ...

(testing conflict detection)

2009-12-17 19:05:06 +00:00

..

blender

Hotkey for outliner window was there twice

2009-12-17 19:05:06 +00:00

blenderplayer

align option for split

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

creator

Support -noaudio in background mode too (it was initialized even in bg, that should be fixed).

2009-12-14 22:29:10 +00:00

darwin

- removed 2.4x release/scripts

2009-09-28 03:19:52 +00:00

gameengine

Fix #20367: game engine crash, origindex layer is now optional.

2009-12-14 10:52:02 +00:00

icons

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

kernel

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

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

Some fixes to get blender compiling on solaris.

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

nan_compile.mk

- remove CPPFLAG XP_UNIX from CMake, Scons and Irix make, checked our own code and /usr/include, its only used in our netscape plugin.

2009-11-19 11:49:42 +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

Some fixes to get blender compiling on solaris.

2009-12-17 17:42:26 +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

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