diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-03-03 19:07:49 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-03-03 19:07:49 +0400 |
| commit | 66a2b848972d47a033f617a40f9a9044756d1d32 (patch) | |
| tree | bf30f5bc13e9c0b4f52aacead676a2c07cbb331a /source/blenderplayer | |
| parent | 0c5dfc8a639b04e1767852121b9dee7cd5bb050f (diff) | |
| parent | 4774357b594c5cd5a38b21df131b539a197c101b (diff) | |
Merged changes in the trunk up to revision 54992.
Resolved conflicts:
release/scripts/startup/bl_ui/space_view3d.py
Diffstat (limited to 'source/blenderplayer')
| -rw-r--r-- | source/blenderplayer/CMakeLists.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index fb06c5e4477..5e65324d893 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -103,7 +103,6 @@ endif() ge_logic_ketsji ge_phys_bullet ge_phys_dummy - ge_phys_common ge_logic ge_rasterizer ge_oglrasterizer |