From: DRC <information@libjpeg-turbo.org>
Date: Tue, 23 Apr 2019 19:54:23 +0000 (-0500)
Subject: Merge branch 'master' into dev
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f36d531553a44c1c1276171bd300abcb59dc1a4c;p=libjpeg-turbo

Merge branch 'master' into dev
---

f36d531553a44c1c1276171bd300abcb59dc1a4c
diff --cc jchuff.c
index e1bd1c0,526203e..fe9d4f8
--- a/jchuff.c
+++ b/jchuff.c
@@@ -4,9 -4,8 +4,9 @@@
   * This file was part of the Independent JPEG Group's software:
   * Copyright (C) 1991-1997, Thomas G. Lane.
   * libjpeg-turbo Modifications:
-  * Copyright (C) 2009-2011, 2014-2016, 2018, D. R. Commander.
+  * Copyright (C) 2009-2011, 2014-2016, 2018-2019, D. R. Commander.
   * Copyright (C) 2015, Matthieu Darbois.
 + * Copyright (C) 2018, Matthias Räncker.
   * For conditions of distribution and use, see the accompanying README.ijg
   * file.
   *