From: DRC Date: Tue, 12 Feb 2019 19:42:57 +0000 (-0600) Subject: Merge branch 'master' into dev X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a9075a17c36efc32064811062300db7fd79b17a3;p=libjpeg-turbo Merge branch 'master' into dev --- a9075a17c36efc32064811062300db7fd79b17a3 diff --cc cmakescripts/GNUInstallDirs.cmake index ec1f9ba,7c41196..6408fca --- a/cmakescripts/GNUInstallDirs.cmake +++ b/cmakescripts/GNUInstallDirs.cmake @@@ -118,8 -118,7 +118,8 @@@ # absolute paths where necessary, using the same logic. #============================================================================= +# Copyright 2018 Matthias Räncker - # Copyright 2016 D. R. Commander + # Copyright 2016, 2019 D. R. Commander # Copyright 2016 Dmitry Marakasov # Copyright 2016 Roger Leigh # Copyright 2015 Alex Turbov