diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-04-01 17:47:19 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-04-01 17:47:19 +0400 |
commit | 5524ed9ba2d60331abed47c9df0bc2fcf330b36b (patch) | |
tree | e8380010f140f022b77236af171d97083a294006 /source/blender/editors/mesh/CMakeLists.txt | |
parent | 1360bb6fb0bf0c5c14235c47bf1399accbcecc6f (diff) | |
parent | 689f3aa174ff795044a4dab719edf60b7b1f5bd3 (diff) |
Merged changes in the trunk up to revision 55700.
Conflicts resolved:
source/blender/editors/mesh/mesh_intern.h
Diffstat (limited to 'source/blender/editors/mesh/CMakeLists.txt')
-rw-r--r-- | source/blender/editors/mesh/CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/editors/mesh/CMakeLists.txt b/source/blender/editors/mesh/CMakeLists.txt index a76872d6e30..1aadac015dd 100644 --- a/source/blender/editors/mesh/CMakeLists.txt +++ b/source/blender/editors/mesh/CMakeLists.txt @@ -42,7 +42,10 @@ set(INC_SYS set(SRC editface.c editmesh_add.c + editmesh_bevel.c editmesh_bvh.c + editmesh_extrude.c + editmesh_inset.c editmesh_knife.c editmesh_knife_project.c editmesh_loopcut.c |