diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-01 19:26:42 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-01 19:26:42 +0300 |
| commit | bfe1d0e0dc6281d33448c3d4ddfa2e231bbc5566 (patch) | |
| tree | 14e9db1c58d7ffc33becc3ff5d74f4feb4c2d75e /source/blender/compositor/nodes/COM_ColorNode.cpp | |
| parent | 297bf7235bc4b2384b99f41676a8c217f2ee3249 (diff) | |
| parent | 75fc1c35070e0cf247f2d2e4cffe8a6e711522ff (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/compositor/nodes/COM_ColorNode.cpp')
| -rw-r--r-- | source/blender/compositor/nodes/COM_ColorNode.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/compositor/nodes/COM_ColorNode.cpp b/source/blender/compositor/nodes/COM_ColorNode.cpp index c3770e79dea..2c37a927e46 100644 --- a/source/blender/compositor/nodes/COM_ColorNode.cpp +++ b/source/blender/compositor/nodes/COM_ColorNode.cpp @@ -15,8 +15,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * Contributor: - * Jeroen Bakker + * Contributor: + * Jeroen Bakker * Monique Dewanchand */ |