diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-07-26 00:59:09 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-07-26 00:59:09 +0400 |
| commit | 1b142434055e2b56b23991f0c9d695b6d4f33390 (patch) | |
| tree | 8689574221e0d98697af406292b0383c14fc0c3b /blenderplayer | |
| parent | dff9dce1cdcb5250797f529456649510d2396096 (diff) | |
| parent | 1c00eacca2b084d7189de33cb75e8612cb542030 (diff) | |
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
Diffstat (limited to 'blenderplayer')
| -rw-r--r-- | blenderplayer/CMakeLists.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/blenderplayer/CMakeLists.txt b/blenderplayer/CMakeLists.txt index 2d8fc6ff4b9..28fe13cbf64 100644 --- a/blenderplayer/CMakeLists.txt +++ b/blenderplayer/CMakeLists.txt @@ -69,7 +69,6 @@ IF(UNIX) bf_blenkernel verse bf_blenkernel - bf_decimation bf_blenloader bf_blenpluginapi bf_blroutines |