diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-12-05 06:12:49 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-12-05 06:12:49 +0400 |
| commit | 3197796cf7aa4f1c34f2e68a2eca9d6a412a51d0 (patch) | |
| tree | 5a0a119149b1079f888178bc2df3d15950c2f9b9 /source/blender/editors/space_file | |
| parent | 43c5e1b58030322096770b1aa4d91077793cd2c4 (diff) | |
| parent | eb233d933223a3795f3ff5204c4412f7a0fd6782 (diff) | |
Merged changes in the trunk up to revision 42425.
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/mesh/editmesh.c
source/blender/editors/space_view3d/drawobject.c
Diffstat (limited to 'source/blender/editors/space_file')
| -rw-r--r-- | source/blender/editors/space_file/filelist.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/editors/space_file/filelist.h b/source/blender/editors/space_file/filelist.h index cd4c22df418..0a8824e473d 100644 --- a/source/blender/editors/space_file/filelist.h +++ b/source/blender/editors/space_file/filelist.h @@ -4,10 +4,7 @@ * 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, * but WITHOUT ANY WARRANTY; without even the implied warranty of |