merged from trunk 20741:20848
authorCampbell Barton <ideasman42@gmail.com>
Sat, 13 Jun 2009 11:09:13 +0000 (11:09 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 13 Jun 2009 11:09:13 +0000 (11:09 +0000)
commiteed13b43b19c619ccdcda67b17c0da65ad44879c
treeaa759322ad2b18becaf237671dd71ffbda9c2076
parente10e1ac04e63ed04a5712e515ed28eb92a78fd62
parent2f1e118c30946bd3117c59cd45f13d79e4b612ec
merged from trunk 20741:20848

* Missing changes to release/windows/installer
* Sequencer fixes in source/blender/src/seqaudio.c dont apply to 2.5
* brechts fix for #18855 r20763 wasnt merged, does this apply to 2.5?
14 files changed:
config/win32-vc-config.py
source/blender/blenkernel/BKE_displist.h
source/blender/blenkernel/intern/booleanops.c
source/blender/blenkernel/intern/displist.c
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenlib/intern/freetypefont.c
source/blender/makesdna/DNA_sequence_types.h
source/blender/render/intern/source/convertblender.c
source/creator/creator.c
source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
tools/Blender.py
tools/btools.py