blender/source
Jean-Luc Peurière a68a7f42b0 resolved conflict state with HEAD r14096
blenderbuttons still bad

not let this compile
2008-03-13 23:54:02 +00:00
..
blender resolved conflict state with HEAD r14096 2008-03-13 23:54:02 +00:00
creator I didn't get any comments so I'm assuming its a good idea. 2008-03-05 21:11:24 +00:00
darwin Filling in branch from trunk 2007-11-06 22:29:20 +00:00
gameengine resolved conflict state with HEAD r14096 2008-03-13 23:54:02 +00:00
icons Filling in branch from trunk 2007-11-06 22:29:20 +00:00
kernel Filling in branch from trunk 2007-11-06 22:29:20 +00:00
CMakeLists.txt Filling in branch from trunk 2007-11-06 22:29:20 +00:00
Makefile Fix: Compiling should work on SOLARIS again. 2008-01-31 12:13:58 +00:00
nan_compile.mk Cloth makefiles bugfix which lead in disabled collisions 2008-03-03 00:43:37 +00:00
nan_definitions.mk Fixing makefiles for binreloc I made it use flags like other 2008-01-18 21:39:47 +00:00
nan_link.mk some changes needed to get blender compiling with 64bit libs, use the systems Mesa now. 2008-01-04 11:55:37 +00:00
nan_subdirs.mk Filling in branch from trunk 2007-11-06 22:29:20 +00:00
nan_warn.mk Filling in branch from trunk 2007-11-06 22:29:20 +00:00
SConscript Filling in branch from trunk 2007-11-06 22:29:20 +00:00