diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-03-02 06:09:27 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-02 06:09:27 +0300 |
| commit | 4913e47aa0107cbe1daf06e8020a60916ea883a3 (patch) | |
| tree | 29cf5e0671027f74296d866cff0df66267bd09c8 /source/blender/render | |
| parent | b7016e69b3fff44d623f8413f9ebd4f7216a9b9b (diff) | |
| parent | 7e4c23e4d7a3a27a49930824c822b679416724f6 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/external_engine.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c index 9b384709f35..ebc4c704adf 100644 --- a/source/blender/render/intern/source/external_engine.c +++ b/source/blender/render/intern/source/external_engine.c @@ -1,11 +1,10 @@ /* - * ***** 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 |