diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2018-06-05 22:59:15 +0300 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2018-06-05 22:59:15 +0300 |
commit | b28c35daef4a39d6bfa53af702bd66006ee9c7f1 (patch) | |
tree | 73d0c2b9257c0041de19f05fb10beb77f22180d3 /source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h | |
parent | 4c2d7767cf3dbabf9a46f7b2a4e1de3c08a2edf7 (diff) | |
parent | 84becb870f8e0785bdfca0f381c7b06f415e4e6a (diff) |
Merge branch 'blender2.8' into hair_guides
Diffstat (limited to 'source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h')
-rw-r--r-- | source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h b/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h index bf3495869b0..cc6bd894748 100644 --- a/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h +++ b/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h @@ -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 */ |