This repository has been archived on 2023-10-09. You can view files and clone it, but cannot push or open issues or pull requests.

Campbell Barton 1b14243405 svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r20937:21899 ...

missing commits from peter 20942, 21165, 21170, 21174, 21597
these files still need manual merging

source/blender/makesdna/DNA_sequence_types.h
source/blender/src/sequence.c
source/blender/src/seqeffects.c
source/blender/src/editseq.c
source/blender/include/BSE_sequence.h

2009-07-25 20:59:09 +00:00

..

CMakeLists.txt

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r20937:21899

2009-07-25 20:59:09 +00:00