diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-11-29 22:18:56 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-29 22:18:56 +0400 |
commit | faa022563d90a2542409dd43f5baa3f1280f44a0 (patch) | |
tree | 20dfab2000f4181464b2dce5f9fcedec862f5db3 /source/blender/modifiers/intern/MOD_util.h | |
parent | 198113b232a407a1fcd5282b998564f656df9680 (diff) | |
parent | 1ec4ceac7e203dd5fbb162933134d4c352cea5f7 (diff) |
svn merge ^/trunk/blender -r42245:42261
Diffstat (limited to 'source/blender/modifiers/intern/MOD_util.h')
-rw-r--r-- | source/blender/modifiers/intern/MOD_util.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/source/blender/modifiers/intern/MOD_util.h b/source/blender/modifiers/intern/MOD_util.h index abc36653082..f1f6252c255 100644 --- a/source/blender/modifiers/intern/MOD_util.h +++ b/source/blender/modifiers/intern/MOD_util.h @@ -4,18 +4,15 @@ * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. The Blender - * Foundation also sells licenses for use in proprietary software under - * the Blender License. See http://www.blender.org/BL/ for information - * about this. + * of the License, or (at your option) any later version. * - * This program is distributed in the hope that it will be useful; + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation; + * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * Contributor(s): Ben Batt |