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/imbuf/intern/indexer.c | |
parent | 70bf00a74c1688e857e3ca1b143b4d7a57a30655 (diff) | |
parent | 4a04f7206914a49f5f95adc5eb786237f1a9f547 (diff) |
svn merge ^/trunk/blender -r41226:41227 .
Diffstat (limited to 'source/blender/imbuf/intern/indexer.c')
-rw-r--r-- | source/blender/imbuf/intern/indexer.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c index e4abd8b329d..242d7dcb700 100644 --- a/source/blender/imbuf/intern/indexer.c +++ b/source/blender/imbuf/intern/indexer.c @@ -1,12 +1,10 @@ /* - * $Id$ - * * ***** BEGIN GPL LICENSE BLOCK ***** * * 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. + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -22,7 +20,7 @@ * Contributor(s): none yet. * * ***** END GPL LICENSE BLOCK ***** -*/ + */ #include "IMB_indexer.h" #include "IMB_anim.h" |