Commit Graph

4 Commits

Author SHA1 Message Date
32c7e22d36 Merged changes in the trunk up to revision 37388.
Conflicts resolved:
release/scripts/startup/bl_ui/properties_render.py
source/creator/SConscript
source/blender/blenlib/intern/bpath.c
source/blender/editors/space_outliner/outliner.c
2011-06-11 00:22:10 +00:00
629248ae3a Fix for path changes in the trunk revision 29935.
This commit should also fix a crash in MinGW32 builds.
2010-07-08 06:11:39 +00:00
d0fa71a68e Merged changes in the trunk up to revision 25508. 2009-12-21 22:38:06 +00:00
Maxime Curioni
e3e6e3ff0c renamed folders 2009-10-05 00:37:30 +00:00