diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-10-24 16:43:08 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-24 16:43:08 +0400 |
commit | 15e6d6cd75fc484e7ac347d25826e7c3217e95a3 (patch) | |
tree | 0156ab8a78e8c4e65176cbb2b95319a6b832b533 /source/blender/editors/metaball | |
parent | 70bf00a74c1688e857e3ca1b143b4d7a57a30655 (diff) | |
parent | 4a04f7206914a49f5f95adc5eb786237f1a9f547 (diff) |
svn merge ^/trunk/blender -r41226:41227 .
Diffstat (limited to 'source/blender/editors/metaball')
-rw-r--r-- | source/blender/editors/metaball/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/editors/metaball/mball_edit.c | 2 | ||||
-rw-r--r-- | source/blender/editors/metaball/mball_intern.h | 2 | ||||
-rw-r--r-- | source/blender/editors/metaball/mball_ops.c | 2 |
4 files changed, 0 insertions, 7 deletions
diff --git a/source/blender/editors/metaball/CMakeLists.txt b/source/blender/editors/metaball/CMakeLists.txt index 76561b12183..4ea596cefbf 100644 --- a/source/blender/editors/metaball/CMakeLists.txt +++ b/source/blender/editors/metaball/CMakeLists.txt @@ -1,4 +1,3 @@ -# $Id: CMakeLists.txt 12931 2007-12-17 18:20:48Z theeth $ # ***** BEGIN GPL LICENSE BLOCK ***** # # This program is free software; you can redistribute it and/or diff --git a/source/blender/editors/metaball/mball_edit.c b/source/blender/editors/metaball/mball_edit.c index 3c16c83bbba..84a466a3d5b 100644 --- a/source/blender/editors/metaball/mball_edit.c +++ b/source/blender/editors/metaball/mball_edit.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * ***** BEGIN GPL LICENSE BLOCK ***** * * This program is free software; you can redistribute it and/or diff --git a/source/blender/editors/metaball/mball_intern.h b/source/blender/editors/metaball/mball_intern.h index 42cc609bec3..792fa80e0c5 100644 --- a/source/blender/editors/metaball/mball_intern.h +++ b/source/blender/editors/metaball/mball_intern.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * ***** BEGIN GPL LICENSE BLOCK ***** * * This program is free software; you can redistribute it and/or diff --git a/source/blender/editors/metaball/mball_ops.c b/source/blender/editors/metaball/mball_ops.c index 1b50cc6523a..4d04fc3e80e 100644 --- a/source/blender/editors/metaball/mball_ops.c +++ b/source/blender/editors/metaball/mball_ops.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * ***** BEGIN GPL LICENSE BLOCK ***** * * This program is free software; you can redistribute it and/or |