Merge branch release-2018

Lots of copyright bumps, also

Change-Id: I0f9e8d81b265cc96cbcc84d30267932af2ab5b69

diff --cc CMakeLists.txt
index 7745cd0012206cdba57ae1aaa6abfffed8455df0,73469b7703e21ce8d266813e7881150616603e8c..86b52f7bb2e74c18b6e740872cf516592eea21bc
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -1,7 -1,7 +1,7 @@@
  #
  # This file is part of the GROMACS molecular simulation package.
  #
--# Copyright (c) 2009,2010,2011,2012,2013,2014,2015,2016,2017, by the GROMACS development team, led by
++# Copyright (c) 2009,2010,2011,2012,2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
  # Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  # and including many others, as listed in the AUTHORS file in the
  # top-level source directory and at http://www.gromacs.org.

diff --cc cmake/gmxManageFFTLibraries.cmake
index 224f03b684dd5a53da5b9e247a75d3815fce05df,2f72efcae7ba3b0a66d01bd169c690e3aa8a56e2..f496ddd9594dfa88fcf7af8f59ba2e404cbe066a
--- 1/cmake/gmxManageFFTLibraries.cmake
--- 2/cmake/gmxManageFFTLibraries.cmake
+++ b/cmake/gmxManageFFTLibraries.cmake
@@@ -1,7 -1,7 +1,7 @@@
  #
  # This file is part of the GROMACS molecular simulation package.
  #
--# Copyright (c) 2012,2013,2014,2015,2016,2017, by the GROMACS development team, led by
++# Copyright (c) 2012,2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
  # Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  # and including many others, as listed in the AUTHORS file in the
  # top-level source directory and at http://www.gromacs.org.

diff --cc cmake/gmxManageGPU.cmake
index e05511239bf1fa3ba38b72ff4c8f6bd3d4940528,42a7a22e29824e9de7c21ab5f984511a89868102..b32df691083db65993eeeee09230966961ffce65
--- 1/cmake/gmxManageGPU.cmake
--- 2/cmake/gmxManageGPU.cmake
+++ b/cmake/gmxManageGPU.cmake
@@@ -1,7 -1,7 +1,7 @@@
  #
  # This file is part of the GROMACS molecular simulation package.
  #
--# Copyright (c) 2012,2013,2014,2015,2016,2017, by the GROMACS development team, led by
++# Copyright (c) 2012,2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
  # Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  # and including many others, as listed in the AUTHORS file in the
  # top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/commandline/pargs.cpp
index c4419f7f03e2f7b8e7feef5b7e171001cb7e3569,c0b321d7114a5539808b371b6a9c1523579f22f7..c35c3a1b35b1542b835c45890a81aa5edcf1e758
--- 1/src/gromacs/commandline/pargs.cpp
--- 2/src/gromacs/commandline/pargs.cpp
+++ b/src/gromacs/commandline/pargs.cpp
@@@ -3,7 -3,7 +3,7 @@@
   *
   * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
   * Copyright (c) 2001-2004, The GROMACS development team.
-- * Copyright (c) 2013,2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/domdec/domdec_setup.cpp
index 4b4d4231b8dbd2b0321ca319c3eceaa05d70099d,dfa9c1418405853a3456c53a04ac9ca7e894e01a..69956c9a8395cfb2207b528737458997a939be7f
--- 1/src/gromacs/domdec/domdec_setup.cpp
--- 2/src/gromacs/domdec/domdec_setup.cpp
+++ b/src/gromacs/domdec/domdec_setup.cpp
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2008,2009,2010,2011,2012,2013,2014,2015,2017, by the GROMACS development team, led by
++ * Copyright (c) 2008,2009,2010,2011,2012,2013,2014,2015,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/energyanalysis/tests/legacyenergy.cpp
index dc2d6217ce4e84d41f3872b974c158d2fed19df9,7162fc1b179d3a77fc0f44419c5be00d172879de..b8a4edf43db7ec48d9daa4c3150669193cc8262e
--- 1/src/gromacs/energyanalysis/tests/legacyenergy.cpp
--- 2/src/gromacs/energyanalysis/tests/legacyenergy.cpp
+++ b/src/gromacs/energyanalysis/tests/legacyenergy.cpp
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2017, by the GROMACS development team, led by
++ * Copyright (c) 2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/ewald/pme-gather.cpp
index 2c9e961feef8c5bf448aea7e351098463265cf21,edaf535b5c8c99bdd5194d0fb4b7be60912f58f0..e9c5c0d8935697f254c46f9c8a140e33ea0bb4bb
--- 1/src/gromacs/ewald/pme-gather.cpp
--- 2/src/gromacs/ewald/pme-gather.cpp
+++ b/src/gromacs/ewald/pme-gather.cpp
@@@ -3,7 -3,7 +3,7 @@@
   *
   * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
   * Copyright (c) 2001-2004, The GROMACS development team.
-- * Copyright (c) 2013,2014,2015,2017, by the GROMACS development team, led by
++ * Copyright (c) 2013,2014,2015,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/ewald/pme-spline-work.cpp
index 5859a340455ffac1dfee4a854c89cf942181fe5b,cb4a625084853d7923d910030aaebeb988851e8f..37b8b07190f3a9ba31596aadd7cfe2ed9a78dfec
--- 1/src/gromacs/ewald/pme-spline-work.cpp
--- 2/src/gromacs/ewald/pme-spline-work.cpp
+++ b/src/gromacs/ewald/pme-spline-work.cpp
@@@ -3,7 -3,7 +3,7 @@@
   *
   * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
   * Copyright (c) 2001-2004, The GROMACS development team.
-- * Copyright (c) 2013,2014,2015,2017, by the GROMACS development team, led by
++ * Copyright (c) 2013,2014,2015,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/ewald/pme-spread.cpp
index b3db6c366bc141439eeed445822338021ed92c8c,f38efc81bca8695a3cd981db65fda8c53e40e60b..3f70f80ed57be8b637a80afbce222c5b2ddd71f5
--- 1/src/gromacs/ewald/pme-spread.cpp
--- 2/src/gromacs/ewald/pme-spread.cpp
+++ b/src/gromacs/ewald/pme-spread.cpp
@@@ -3,7 -3,7 +3,7 @@@
   *
   * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
   * Copyright (c) 2001-2004, The GROMACS development team.
-- * Copyright (c) 2013,2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/gpu_utils/gpu_utils.cu
index 84e918fc01170c3e5262e9393e591df1eafab1a8,9ca379ee96366cf64016c78b09fdafd5891fcad5..2df4709ab4755440375242777b30326fe470cbaa
--- 1/src/gromacs/gpu_utils/gpu_utils.cu
--- 2/src/gromacs/gpu_utils/gpu_utils.cu
+++ b/src/gromacs/gpu_utils/gpu_utils.cu
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2010,2011,2012,2013,2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2010,2011,2012,2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/gpu_utils/gpu_utils.h
index d7e724aedf022b7e10d80b414201028bf3b19247,1a5ced2c0ba7640bebb8d1bccdd8f948edfb5367..c364363ed6efe173ec0ef518e192c61906a98ecd
--- 1/src/gromacs/gpu_utils/gpu_utils.h
--- 2/src/gromacs/gpu_utils/gpu_utils.h
+++ b/src/gromacs/gpu_utils/gpu_utils.h
@@@ -3,7 -3,7 +3,7 @@@
   *
   * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
   * Copyright (c) 2001-2010, The GROMACS development team.
-- * Copyright (c) 2012,2013,2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2012,2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/gpu_utils/tests/gputest.cpp
index 2cd80e1609a5391c8adc87c2a9d0851e173bb02a,03abbf8784524e8d40ff89ca87a1e6831429568f..7d7a7536a00df99ab49c0d68d36e2fc59c38a023
--- 1/src/gromacs/gpu_utils/tests/gputest.cpp
--- 2/src/gromacs/gpu_utils/tests/gputest.cpp
+++ b/src/gromacs/gpu_utils/tests/gputest.cpp
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2017, by the GROMACS development team, led by
++ * Copyright (c) 2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/gpu_utils/tests/hostallocator.cpp
index 809cce2b5a593292c82126e9493dc83f9943de32,53daa9cb980a2edc47b358416296ebfaf0877574..5ea54eaecbd25fe9c371b8150c346037e3921ef4
--- 1/src/gromacs/gpu_utils/tests/hostallocator.cpp
--- 2/src/gromacs/gpu_utils/tests/hostallocator.cpp
+++ b/src/gromacs/gpu_utils/tests/hostallocator.cpp
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2017, by the GROMACS development team, led by
++ * Copyright (c) 2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/gpu_utils/tests/pinnedmemorychecker.cpp
index 0f34dab15fda23ba522351ee303e2feeaf8c298a,f6d1643a9e27b86a22cbe8099a5f66d1d5dbdf35..7366aaf344eb49f5da0db49c44d1275660536648
--- 1/src/gromacs/gpu_utils/tests/pinnedmemorychecker.cpp
--- 2/src/gromacs/gpu_utils/tests/pinnedmemorychecker.cpp
+++ b/src/gromacs/gpu_utils/tests/pinnedmemorychecker.cpp
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2017, by the GROMACS development team, led by
++ * Copyright (c) 2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/hardware/architecture.h
index aeda6c3a91479c95b34e082c46f63dad939e019c,fc897a077cea4f5b6dba54c5d0edc28608f44a4a..34d5b082a18f06b30761f0bda77d3a8c2dfc653e
--- 1/src/gromacs/hardware/architecture.h
--- 2/src/gromacs/hardware/architecture.h
+++ b/src/gromacs/hardware/architecture.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2017, by the GROMACS development team, led by
++ * Copyright (c) 2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/hardware/cpuinfo.cpp
index 273d8d8e2c23fbb57560819d4d96b38d8bd44053,6f16a041c52b165ef2cddfd43e975f314a1f3fbe..917bdeda609701c188842aa4f38b74b23941defe
--- 1/src/gromacs/hardware/cpuinfo.cpp
--- 2/src/gromacs/hardware/cpuinfo.cpp
+++ b/src/gromacs/hardware/cpuinfo.cpp
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2012,2013,2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2012,2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/hardware/detecthardware.cpp
index 015f3003ad2165cb9bf4797dab51ac6844da4f0e,f72237eab67ebfe9328168d1a4505161528b5bb7..ea1737a5721404eb0752b44820fee5bb030f2fb6
--- 1/src/gromacs/hardware/detecthardware.cpp
--- 2/src/gromacs/hardware/detecthardware.cpp
+++ b/src/gromacs/hardware/detecthardware.cpp
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2012,2013,2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2012,2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/listed-forces/bonded.cpp
index c9d7b45e02b9c97edd2c2b0183f0d07f7da4903f,425e74478709a85abaef535ab28ece7f3ee3ea18..ac12d4c8af7eafee846c3106f2f09a254852f40d
--- 1/src/gromacs/listed-forces/bonded.cpp
--- 2/src/gromacs/listed-forces/bonded.cpp
+++ b/src/gromacs/listed-forces/bonded.cpp
@@@ -3,7 -3,7 +3,7 @@@
   *
   * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
   * Copyright (c) 2001-2004, The GROMACS development team.
-- * Copyright (c) 2013,2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/listed-forces/pairs.cpp
index 6d0d1794de6fdb08f421e30662446194bc476d96,dd4b061a1f0e4ff3412db11a4a6f8a350e017480..fdc2279c20983c9a7eeae6f7195316ae3c190ac5
--- 1/src/gromacs/listed-forces/pairs.cpp
--- 2/src/gromacs/listed-forces/pairs.cpp
+++ b/src/gromacs/listed-forces/pairs.cpp
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/mdlib/clincs.cpp
index 336e75b4aa9858105d64dc0828fd36bc2352dcfd,6b272513ac7ca69b5b825667eaca202d77b47c80..f254bea23f98241307e4cb95a2385d27d2e30856
--- 1/src/gromacs/mdlib/clincs.cpp
--- 2/src/gromacs/mdlib/clincs.cpp
+++ b/src/gromacs/mdlib/clincs.cpp
@@@ -3,7 -3,7 +3,7 @@@
   *
   * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
   * Copyright (c) 2001-2004, The GROMACS development team.
-- * Copyright (c) 2013,2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/mdlib/csettle.cpp
index 34a011a0e32d208fe7a384ec242e668a0840146f,d65405c3a9942d52ca7d8b99c004b984470ec17f..0fa7e3c7221e6b2d56814b73954ac082c2221640
--- 1/src/gromacs/mdlib/csettle.cpp
--- 2/src/gromacs/mdlib/csettle.cpp
+++ b/src/gromacs/mdlib/csettle.cpp
@@@ -3,7 -3,7 +3,7 @@@
   *
   * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
   * Copyright (c) 2001-2004, The GROMACS development team.
-- * Copyright (c) 2013,2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/mdlib/gmx_omp_nthreads.cpp
index 6c3b06b0992affb830af5c6d7c06184739cadbdd,4f04591d38e7ed7e76999682b397d4afe90cb742..d8df2950446a29187303b94c54f2f16ab88c3ed8
--- 1/src/gromacs/mdlib/gmx_omp_nthreads.cpp
--- 2/src/gromacs/mdlib/gmx_omp_nthreads.cpp
+++ b/src/gromacs/mdlib/gmx_omp_nthreads.cpp
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2012,2013,2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2012,2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/mdlib/md_support.cpp
index 9115a942a5b510ab07ba0e23d021c469a54f5116,72d90484dbd69c3d0169f73a104ec29b4881fde6..b25a37cf3e95d5ebfdf5fb3a445b8b7a6f3bbb67
--- 1/src/gromacs/mdlib/md_support.cpp
--- 2/src/gromacs/mdlib/md_support.cpp
+++ b/src/gromacs/mdlib/md_support.cpp
@@@ -3,7 -3,7 +3,7 @@@
   *
   * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
   * Copyright (c) 2001-2004, The GROMACS development team.
-- * Copyright (c) 2013,2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/mdlib/md_support.h
index 20bbcc8b0bbeff83e0b7203cde0d4fd2703b2dac,ddee3c679219a8ea3b25edd9c4d5511a46d48d56..e6b092da974e4384e2f71d782f4bbc5174fba0d3
--- 1/src/gromacs/mdlib/md_support.h
--- 2/src/gromacs/mdlib/md_support.h
+++ b/src/gromacs/mdlib/md_support.h
@@@ -3,7 -3,7 +3,7 @@@
   *
   * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
   * Copyright (c) 2001-2004, The GROMACS development team.
-- * Copyright (c) 2013,2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_inner.h
index 3dfc89b2ade33b763745af51d5c79accb7d4392e,ff968573b6636f9b42d54ab19238324a17446eb5..844f55d7f58ddc3860b640e30c7318ebee5bbd04
--- 1/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_inner.h
--- 2/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_inner.h
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_inner.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2012,2013,2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2012,2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h
index 2aa994455f01171c3eacf1a4e5e237ad728ae9f2,b2960bce4a2a2db7874ee1a736aacc2a6d7bcdc2..ae56ddbf3be5fe52547f4e42283473c9b05f9efa
--- 1/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h
--- 2/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2012,2013,2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2012,2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_inner.h
index f0b0b7a8bc66ecefd3207ce4db75377b391a0248,782a3fbb69294ead586db6b1f302a3c9b53215c1..a3169fe83b8fc5ec30499ac758f37cca30b115d5
--- 1/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_inner.h
--- 2/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_inner.h
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_inner.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2012,2013,2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2012,2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h
index 167379c455f1ca241dca3abcbed6bf492036a517,8ca51262935a17d90fd7f24df379a8a2ce719caf..696d53a7fac0c40363c73692559199a7d119cf05
--- 1/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h
--- 2/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2012,2013,2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2012,2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/mdlib/sim_util.cpp
index b746326ac9e4c8228240e6de43b15691610fece4,ee757e41813383d99063be53eb3a16f466be1a9e..c2c40c441470b1a3cef2106b587e2dfc277878e4
--- 1/src/gromacs/mdlib/sim_util.cpp
--- 2/src/gromacs/mdlib/sim_util.cpp
+++ b/src/gromacs/mdlib/sim_util.cpp
@@@ -3,7 -3,7 +3,7 @@@
   *
   * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
   * Copyright (c) 2001-2004, The GROMACS development team.
-- * Copyright (c) 2013,2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/impl_arm_neon/impl_arm_neon_definitions.h
index 2800f1f8830489d350daa36c058fbdac0bb4f6f1,388c44654ed016942c5f760876c5d7fc1661e080..6e767c5aaabd35a1797e5f9445bedc6680ff7cee
--- 1/src/gromacs/simd/impl_arm_neon/impl_arm_neon_definitions.h
--- 2/src/gromacs/simd/impl_arm_neon/impl_arm_neon_definitions.h
+++ b/src/gromacs/simd/impl_arm_neon/impl_arm_neon_definitions.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2014,2015,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/impl_arm_neon/impl_arm_neon_util_float.h
index d2919f4384947039ca276e341bd6f4da0b14997d,2648fef615562224fca6880ac25111d0c7025d68..93aaed2561fb24041eb3538f5ff12199da0894c4
--- 1/src/gromacs/simd/impl_arm_neon/impl_arm_neon_util_float.h
--- 2/src/gromacs/simd/impl_arm_neon/impl_arm_neon_util_float.h
+++ b/src/gromacs/simd/impl_arm_neon/impl_arm_neon_util_float.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-  * Copyright (c) 2014,2015,2016, by the GROMACS development team, led by
 - * Copyright (c) 2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/impl_arm_neon_asimd/impl_arm_neon_asimd_definitions.h
index ab1a7783af8787aab64d2d7caf72fa000539881e,c7b807d2d2fa5632979395414267559c2fbd2478..20ab5bceeabe25e8ff7479e9d209d0074121566f
--- 1/src/gromacs/simd/impl_arm_neon_asimd/impl_arm_neon_asimd_definitions.h
--- 2/src/gromacs/simd/impl_arm_neon_asimd/impl_arm_neon_asimd_definitions.h
+++ b/src/gromacs/simd/impl_arm_neon_asimd/impl_arm_neon_asimd_definitions.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-  * Copyright (c) 2014,2015, by the GROMACS development team, led by
 - * Copyright (c) 2014,2015,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/impl_arm_neon_asimd/impl_arm_neon_asimd_util_double.h
index 45abcbbe1667d9d4593a74ad96bdd8fa4404d2da,ec54d0ee6837779d75de9a2c8b53a90b8f8394fd..2dfb2480a83aaac37faf8f5db6e22eb5df0ae0fa
--- 1/src/gromacs/simd/impl_arm_neon_asimd/impl_arm_neon_asimd_util_double.h
--- 2/src/gromacs/simd/impl_arm_neon_asimd/impl_arm_neon_asimd_util_double.h
+++ b/src/gromacs/simd/impl_arm_neon_asimd/impl_arm_neon_asimd_util_double.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-  * Copyright (c) 2014,2015, by the GROMACS development team, led by
 - * Copyright (c) 2014,2015,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/impl_ibm_qpx/impl_ibm_qpx_definitions.h
index 1da37d2a2a6f6a85d5be23d1fe184a61173267fc,99128004b314cca18984f2b4eafe9a56a6d8c620..a2204b0c86ee2ae389fd558c5e72d17359129a40
--- 1/src/gromacs/simd/impl_ibm_qpx/impl_ibm_qpx_definitions.h
--- 2/src/gromacs/simd/impl_ibm_qpx/impl_ibm_qpx_definitions.h
+++ b/src/gromacs/simd/impl_ibm_qpx/impl_ibm_qpx_definitions.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-  * Copyright (c) 2014,2015, by the GROMACS development team, led by
 - * Copyright (c) 2014,2015,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/impl_ibm_qpx/impl_ibm_qpx_simd_double.h
index dc20d78213a5e1ff134884a1dc51eeec10949afd,16a2f8ff343f4ecc586ec9bfcd4d4a80ff0c110e..497d45f321701f02db42db7e75452f0523f92d0e
--- 1/src/gromacs/simd/impl_ibm_qpx/impl_ibm_qpx_simd_double.h
--- 2/src/gromacs/simd/impl_ibm_qpx/impl_ibm_qpx_simd_double.h
+++ b/src/gromacs/simd/impl_ibm_qpx/impl_ibm_qpx_simd_double.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/impl_ibm_qpx/impl_ibm_qpx_simd_float.h
index 12ffdbd31c30fc8cbd85ae5138e2e8821ff3d664,83b74d1ad183bea3cca63797074801950c845d2e..322234b8f42d112214e865d429e92e4c7b441c5f
--- 1/src/gromacs/simd/impl_ibm_qpx/impl_ibm_qpx_simd_float.h
--- 2/src/gromacs/simd/impl_ibm_qpx/impl_ibm_qpx_simd_float.h
+++ b/src/gromacs/simd/impl_ibm_qpx/impl_ibm_qpx_simd_float.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/impl_ibm_qpx/impl_ibm_qpx_util_double.h
index 5a220c412002b29e3b4a6b00dddeeb639ea54808,633327a660d35fbb643e382a6caf7d460e83ccf0..7c06ebcb3c9dd92bf2c8b5bd89daf9df8a9ea14d
--- 1/src/gromacs/simd/impl_ibm_qpx/impl_ibm_qpx_util_double.h
--- 2/src/gromacs/simd/impl_ibm_qpx/impl_ibm_qpx_util_double.h
+++ b/src/gromacs/simd/impl_ibm_qpx/impl_ibm_qpx_util_double.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-  * Copyright (c) 2014,2015,2016, by the GROMACS development team, led by
 - * Copyright (c) 2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/impl_ibm_qpx/impl_ibm_qpx_util_float.h
index 2e12fab5bcfe93a95c865a44412dc3d09e1a32bb,c3b3d9cadc8833eec4a07f09a3700a00c62a3d94..e63faa92507f78833f94be1d1b25f540645ac781
--- 1/src/gromacs/simd/impl_ibm_qpx/impl_ibm_qpx_util_float.h
--- 2/src/gromacs/simd/impl_ibm_qpx/impl_ibm_qpx_util_float.h
+++ b/src/gromacs/simd/impl_ibm_qpx/impl_ibm_qpx_util_float.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-  * Copyright (c) 2014,2015,2016, by the GROMACS development team, led by
 - * Copyright (c) 2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/impl_ibm_vmx/impl_ibm_vmx_definitions.h
index e01f1bbf0220b067500466fc4207b20ae0249353,1878d2ac70752f70a8354425c4e6b2c5dbfea42c..3400c8097751ca7e07f5437a82c8865ef11fa3ae
--- 1/src/gromacs/simd/impl_ibm_vmx/impl_ibm_vmx_definitions.h
--- 2/src/gromacs/simd/impl_ibm_vmx/impl_ibm_vmx_definitions.h
+++ b/src/gromacs/simd/impl_ibm_vmx/impl_ibm_vmx_definitions.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-  * Copyright (c) 2014,2015, by the GROMACS development team, led by
 - * Copyright (c) 2014,2015,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/impl_ibm_vmx/impl_ibm_vmx_util_float.h
index 95690c36ff751801d546383abe8f0bc86355712f,e4edc8dc34a0975c28a1e83e991ce861dbba7d45..3fc3aaa11793788034fad448e698d22e2bb091b4
--- 1/src/gromacs/simd/impl_ibm_vmx/impl_ibm_vmx_util_float.h
--- 2/src/gromacs/simd/impl_ibm_vmx/impl_ibm_vmx_util_float.h
+++ b/src/gromacs/simd/impl_ibm_vmx/impl_ibm_vmx_util_float.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-  * Copyright (c) 2014,2015,2016, by the GROMACS development team, led by
 - * Copyright (c) 2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/impl_ibm_vsx/impl_ibm_vsx.h
index 26a820876752d1eb5d6fdc04cb7fa58a638432d3,6f49d8a9c580f6ff09216c1c3c1c86e766e9ad15..e69fd33c3999c521c4361e4488d0a1a43b18f5f3
--- 1/src/gromacs/simd/impl_ibm_vsx/impl_ibm_vsx.h
--- 2/src/gromacs/simd/impl_ibm_vsx/impl_ibm_vsx.h
+++ b/src/gromacs/simd/impl_ibm_vsx/impl_ibm_vsx.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-  * Copyright (c) 2014,2015, by the GROMACS development team, led by
 - * Copyright (c) 2014,2015,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/impl_ibm_vsx/impl_ibm_vsx_definitions.h
index 3370727306244d5004d13610fd8a38b2e11d4d05,b55c2a63c45f3f4a2bc912d8be76b87e31891b2e..21fb93c7c735d9c98b24bcf6be9ce2bb1352937e
--- 1/src/gromacs/simd/impl_ibm_vsx/impl_ibm_vsx_definitions.h
--- 2/src/gromacs/simd/impl_ibm_vsx/impl_ibm_vsx_definitions.h
+++ b/src/gromacs/simd/impl_ibm_vsx/impl_ibm_vsx_definitions.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-  * Copyright (c) 2014,2015, by the GROMACS development team, led by
 - * Copyright (c) 2014,2015,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/impl_ibm_vsx/impl_ibm_vsx_util_double.h
index 868b40f2485ab031cc814b8af30cf6281838dadf,d5745bf631e2e955dd56632976236b0208c62035..d413a5c73321fe9f883cffb1676d6756200e9eee
--- 1/src/gromacs/simd/impl_ibm_vsx/impl_ibm_vsx_util_double.h
--- 2/src/gromacs/simd/impl_ibm_vsx/impl_ibm_vsx_util_double.h
+++ b/src/gromacs/simd/impl_ibm_vsx/impl_ibm_vsx_util_double.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-  * Copyright (c) 2014,2015,2016, by the GROMACS development team, led by
 - * Copyright (c) 2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/impl_ibm_vsx/impl_ibm_vsx_util_float.h
index 8863765784e716b99bfc4bc734871bb4cd7e1cb4,d85b0ca5ae6e2973cafdacf98f1a8956d0b6bfc0..50e8ce8ad6aa763713e9fea9e04eb4120bf50e7e
--- 1/src/gromacs/simd/impl_ibm_vsx/impl_ibm_vsx_util_float.h
--- 2/src/gromacs/simd/impl_ibm_vsx/impl_ibm_vsx_util_float.h
+++ b/src/gromacs/simd/impl_ibm_vsx/impl_ibm_vsx_util_float.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/impl_none/impl_none.h
index ceef6b47e6f1c08d9e6e61c85b2b3eec6640dd8d,7688e571d5defa9052c62ac57ff5f2ac37e38c7e..d457f6d428bbcb432cce8cab752fe423ab5caee1
--- 1/src/gromacs/simd/impl_none/impl_none.h
--- 2/src/gromacs/simd/impl_none/impl_none.h
+++ b/src/gromacs/simd/impl_none/impl_none.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-  * Copyright (c) 2015, by the GROMACS development team, led by
 - * Copyright (c) 2015,2017, by the GROMACS development team, led by
++ * Copyright (c) 2015,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/impl_reference/impl_reference_definitions.h
index 1f9709f20cf6f1a31049fbe7bc34d3e7df727883,ac6f9120a49f8694cd59cfe8e7434fa5580fb856..f0f6e4e735f541801c7f966ad62b7397c5a60dc1
--- 1/src/gromacs/simd/impl_reference/impl_reference_definitions.h
--- 2/src/gromacs/simd/impl_reference/impl_reference_definitions.h
+++ b/src/gromacs/simd/impl_reference/impl_reference_definitions.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2014,2015,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/impl_x86_avx2_128/impl_x86_avx2_128_definitions.h
index 49182e22f9683c6e8411fe1d5b96dcb81a3edaf9,86f30dab090056d595d898714cd00e2adb3f1bc6..b44204bddc61f23b54553cea6ae1c02108579364
--- 1/src/gromacs/simd/impl_x86_avx2_128/impl_x86_avx2_128_definitions.h
--- 2/src/gromacs/simd/impl_x86_avx2_128/impl_x86_avx2_128_definitions.h
+++ b/src/gromacs/simd/impl_x86_avx2_128/impl_x86_avx2_128_definitions.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2014,2015,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/impl_x86_avx2_256/impl_x86_avx2_256_definitions.h
index d80cccc11275d65e1c1e1df36bb60b4105538d8f,a8ab2b4f308d7404e5afbf084240c5abccd82732..da2d146cda035895730b32132ea968a9c0c3a6a9
--- 1/src/gromacs/simd/impl_x86_avx2_256/impl_x86_avx2_256_definitions.h
--- 2/src/gromacs/simd/impl_x86_avx2_256/impl_x86_avx2_256_definitions.h
+++ b/src/gromacs/simd/impl_x86_avx2_256/impl_x86_avx2_256_definitions.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2014,2015,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/impl_x86_avx_128_fma/impl_x86_avx_128_fma_definitions.h
index f2b5a20d926d932e34e34071acc9c493f11fdbc2,ab8f533ce366e20d1f1de664775074c31ab99574..a3d53e64617bf4b71a808f42ce78821c2943974b
--- 1/src/gromacs/simd/impl_x86_avx_128_fma/impl_x86_avx_128_fma_definitions.h
--- 2/src/gromacs/simd/impl_x86_avx_128_fma/impl_x86_avx_128_fma_definitions.h
+++ b/src/gromacs/simd/impl_x86_avx_128_fma/impl_x86_avx_128_fma_definitions.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-  * Copyright (c) 2014,2015,2016, by the GROMACS development team, led by
 - * Copyright (c) 2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/impl_x86_avx_256/impl_x86_avx_256_definitions.h
index 4b2474c271232e0f7dfee7499ff54f0f4ed26533,72e7ce98784055b6ea5d2361ea51970572517e1a..106ba1c3e69c010ad7b9ed543110739c76837aa9
--- 1/src/gromacs/simd/impl_x86_avx_256/impl_x86_avx_256_definitions.h
--- 2/src/gromacs/simd/impl_x86_avx_256/impl_x86_avx_256_definitions.h
+++ b/src/gromacs/simd/impl_x86_avx_256/impl_x86_avx_256_definitions.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2014,2015,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/impl_x86_avx_256/impl_x86_avx_256_util_double.h
index a3cefcbbb01a85757965fe9251c03a573e1b041c,23f43c988ba7250a4e44c5dca48bf196e3b117ea..241c612e12205a60aca4f6adadee61907a0a9227
--- 1/src/gromacs/simd/impl_x86_avx_256/impl_x86_avx_256_util_double.h
--- 2/src/gromacs/simd/impl_x86_avx_256/impl_x86_avx_256_util_double.h
+++ b/src/gromacs/simd/impl_x86_avx_256/impl_x86_avx_256_util_double.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-  * Copyright (c) 2014,2015, by the GROMACS development team, led by
 - * Copyright (c) 2014,2015,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/impl_x86_avx_256/impl_x86_avx_256_util_float.h
index 2eebda93e416b8e978c07effa36fde2e7364121d,2d19218593a1440328cb01cb852a2de73153d1b3..f96fe28ce12f964391bd9a0352af08fcda32d2f6
--- 1/src/gromacs/simd/impl_x86_avx_256/impl_x86_avx_256_util_float.h
--- 2/src/gromacs/simd/impl_x86_avx_256/impl_x86_avx_256_util_float.h
+++ b/src/gromacs/simd/impl_x86_avx_256/impl_x86_avx_256_util_float.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2014,2015,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/impl_x86_avx_512/impl_x86_avx_512_definitions.h
index 45acf123973f1853694ec18353ef0fd6c5295807,a27ea2c628b21e35626625bbb48d9be578639f5c..4e82a0fb8ff8fe8c998ad00b29a4a848997c1904
--- 1/src/gromacs/simd/impl_x86_avx_512/impl_x86_avx_512_definitions.h
--- 2/src/gromacs/simd/impl_x86_avx_512/impl_x86_avx_512_definitions.h
+++ b/src/gromacs/simd/impl_x86_avx_512/impl_x86_avx_512_definitions.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/impl_x86_avx_512/impl_x86_avx_512_util_double.h
index 3ff77c61e07a99804ae932f85560671338e101c2,22b4ffaae29a1b49461a071e1a2c7cb04ee4ee10..8bb451d55064639519e87a55b48df63c0e2e62c9
--- 1/src/gromacs/simd/impl_x86_avx_512/impl_x86_avx_512_util_double.h
--- 2/src/gromacs/simd/impl_x86_avx_512/impl_x86_avx_512_util_double.h
+++ b/src/gromacs/simd/impl_x86_avx_512/impl_x86_avx_512_util_double.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/impl_x86_avx_512/impl_x86_avx_512_util_float.h
index 61548bba13f889062424603a225e406c75a2dad4,6f94b981918492e80de572dd773eefd037283e2f..6f6bf175a419ee3cace07926f9e3238547b5124b
--- 1/src/gromacs/simd/impl_x86_avx_512/impl_x86_avx_512_util_float.h
--- 2/src/gromacs/simd/impl_x86_avx_512/impl_x86_avx_512_util_float.h
+++ b/src/gromacs/simd/impl_x86_avx_512/impl_x86_avx_512_util_float.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/impl_x86_avx_512_knl/impl_x86_avx_512_knl_definitions.h
index d0698fa8bebe9c97df526781cdd56202609470cd,ada37e237c24fa739fbc80c0cd974c970d794d8c..6f988fed2f95df27581a7a9a0d74b5a9e746c723
--- 1/src/gromacs/simd/impl_x86_avx_512_knl/impl_x86_avx_512_knl_definitions.h
--- 2/src/gromacs/simd/impl_x86_avx_512_knl/impl_x86_avx_512_knl_definitions.h
+++ b/src/gromacs/simd/impl_x86_avx_512_knl/impl_x86_avx_512_knl_definitions.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/impl_x86_mic/impl_x86_mic_definitions.h
index 61123eb1d9e56e243124c2affeb182a2016ca7f0,c6135c66aba0d7e915323f83db1daeb59ebb9bbf..fc9b71990f69af824837b36ed67f7be3b0620a79
--- 1/src/gromacs/simd/impl_x86_mic/impl_x86_mic_definitions.h
--- 2/src/gromacs/simd/impl_x86_mic/impl_x86_mic_definitions.h
+++ b/src/gromacs/simd/impl_x86_mic/impl_x86_mic_definitions.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-  * Copyright (c) 2014,2015, by the GROMACS development team, led by
 - * Copyright (c) 2014,2015,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/impl_x86_mic/impl_x86_mic_util_double.h
index 62e072071fb900490c85897708e019ecd40bd3ed,9904fc5fd932b8431543ffc4b00e209f7dcfd0a4..e6d6679818e952434830ec46f6314411eb624323
--- 1/src/gromacs/simd/impl_x86_mic/impl_x86_mic_util_double.h
--- 2/src/gromacs/simd/impl_x86_mic/impl_x86_mic_util_double.h
+++ b/src/gromacs/simd/impl_x86_mic/impl_x86_mic_util_double.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/impl_x86_mic/impl_x86_mic_util_float.h
index 48b2a9f6638b73a9ca6ec0d8b47a42889bca1ee2,036ff2fb881edac474bb40ebdcf247f3f5365ab8..b766e1b444b5eee2936b93f7542fb3daf4ed4095
--- 1/src/gromacs/simd/impl_x86_mic/impl_x86_mic_util_float.h
--- 2/src/gromacs/simd/impl_x86_mic/impl_x86_mic_util_float.h
+++ b/src/gromacs/simd/impl_x86_mic/impl_x86_mic_util_float.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/impl_x86_sse2/impl_x86_sse2_definitions.h
index 7b585d4e28dcaf37ff192a5ef3fa051309bcaab0,0cc62e9de15cb58df39e696d20064dd553a3dfa4..85128bb0dcd7ec6975cff1eb50473910482dc4f2
--- 1/src/gromacs/simd/impl_x86_sse2/impl_x86_sse2_definitions.h
--- 2/src/gromacs/simd/impl_x86_sse2/impl_x86_sse2_definitions.h
+++ b/src/gromacs/simd/impl_x86_sse2/impl_x86_sse2_definitions.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-  * Copyright (c) 2014,2015, by the GROMACS development team, led by
 - * Copyright (c) 2014,2015,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/impl_x86_sse2/impl_x86_sse2_util_float.h
index 67e3047a58f19a62e038a0cef755aebf4fbe64b5,4acf483065d8480e1a86c83c51e7a0dedd50405b..53bcaffc8a8762e5716ab4bdec9bc6d89cddd94a
--- 1/src/gromacs/simd/impl_x86_sse2/impl_x86_sse2_util_float.h
--- 2/src/gromacs/simd/impl_x86_sse2/impl_x86_sse2_util_float.h
+++ b/src/gromacs/simd/impl_x86_sse2/impl_x86_sse2_util_float.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-  * Copyright (c) 2014,2015, by the GROMACS development team, led by
 - * Copyright (c) 2014,2015,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/impl_x86_sse4_1/impl_x86_sse4_1_definitions.h
index 4d172273629d74f3fae6a3f8b1ab48c9e2d25f07,e9282ac57bfa38a2aa354e2377a407225a960a5b..0d5d3f48b95e7a6b55b9105e62ca1c594396dd1f
--- 1/src/gromacs/simd/impl_x86_sse4_1/impl_x86_sse4_1_definitions.h
--- 2/src/gromacs/simd/impl_x86_sse4_1/impl_x86_sse4_1_definitions.h
+++ b/src/gromacs/simd/impl_x86_sse4_1/impl_x86_sse4_1_definitions.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-  * Copyright (c) 2014,2015, by the GROMACS development team, led by
 - * Copyright (c) 2014,2015,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/simd_math.h
index ad519574b1683cb8bd410d2ceece516f34bc64d0,207b1b784a2d6b5c5bc9df136ea138a206aed8dc..a45ba4b84d2bb092e676c5f6c4babe00747b8108
--- 1/src/gromacs/simd/simd_math.h
--- 2/src/gromacs/simd/simd_math.h
+++ b/src/gromacs/simd/simd_math.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2012,2013,2014,2015,2017, by the GROMACS development team, led by
++ * Copyright (c) 2012,2013,2014,2015,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/tests/bootstrap_loadstore.cpp
index 5bbdb1d35f80ea3d75806e08c5add85c7d33891e,1ffe38a48c8d00d327706815526ffc8247fadae9..bb9307f3c7cf80e633e1d92fd4dbcb3ef9471db6
--- 1/src/gromacs/simd/tests/bootstrap_loadstore.cpp
--- 2/src/gromacs/simd/tests/bootstrap_loadstore.cpp
+++ b/src/gromacs/simd/tests/bootstrap_loadstore.cpp
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2014,2015,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/tests/simd.cpp
index d07621baa1271f15b0c7e4c0f0baa0ce5ddfed4c,3de3c0e4b3e19a124558e0ff3e792d438c6382f0..8655f64dcd5c381adc22cc040e8d91ee007a68d8
--- 1/src/gromacs/simd/tests/simd.cpp
--- 2/src/gromacs/simd/tests/simd.cpp
+++ b/src/gromacs/simd/tests/simd.cpp
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/tests/simd.h
index a32676bf7c0e83d9c4c6299e3de89e191ecdc182,efa57f3589ebee1bffd16aadc828111478151869..b4d08f4c5858ec6aa6895f301428957a8da2049a
--- 1/src/gromacs/simd/tests/simd.h
--- 2/src/gromacs/simd/tests/simd.h
+++ b/src/gromacs/simd/tests/simd.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/tests/simd4.cpp
index edb66badf06bc5dceca67bfb37352965ee630b5d,ba915941009e7758239c44399f772efdd785ecef..86858d67b88f765da4752d8b21536e6dc1e1014e
--- 1/src/gromacs/simd/tests/simd4.cpp
--- 2/src/gromacs/simd/tests/simd4.cpp
+++ b/src/gromacs/simd/tests/simd4.cpp
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2014,2015,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/tests/simd4_floatingpoint.cpp
index b2300ec8be733abe5c03a77103b17332224c47ad,50e8687fcdb38eccc2e61a1e9f60d195131c4107..451dadd7dcc90636370a8cfe6c0eefa55c500305
--- 1/src/gromacs/simd/tests/simd4_floatingpoint.cpp
--- 2/src/gromacs/simd/tests/simd4_floatingpoint.cpp
+++ b/src/gromacs/simd/tests/simd4_floatingpoint.cpp
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/tests/simd_floatingpoint.cpp
index 14fbe0d366362ee330eb2dd9649294c95f45003b,2c57354c9bb70dcf969f173d910769422ceaa15a..825df83b6fdd07565eb5d5126a287b0681f6ae92
--- 1/src/gromacs/simd/tests/simd_floatingpoint.cpp
--- 2/src/gromacs/simd/tests/simd_floatingpoint.cpp
+++ b/src/gromacs/simd/tests/simd_floatingpoint.cpp
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/tests/simd_floatingpoint_util.cpp
index a43dfc5d7f9fb589181123025e65da4a069a988c,c229fb37c8696fe553e24763b219a3c8c1f62d5d..a957201707558482654eba9faa837c9bf9862b15
--- 1/src/gromacs/simd/tests/simd_floatingpoint_util.cpp
--- 2/src/gromacs/simd/tests/simd_floatingpoint_util.cpp
+++ b/src/gromacs/simd/tests/simd_floatingpoint_util.cpp
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2015,2017, by the GROMACS development team, led by
++ * Copyright (c) 2015,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/tests/simd_integer.cpp
index c675f8b03490162c92e51077fb1d455855a47ae8,594827d84d4b943d2c44143a62f8534ac5f5e503..b2a99ecd780ab7853a74ac09aa1ac2ce9d29a7d1
--- 1/src/gromacs/simd/tests/simd_integer.cpp
--- 2/src/gromacs/simd/tests/simd_integer.cpp
+++ b/src/gromacs/simd/tests/simd_integer.cpp
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/simd/tests/simd_math.cpp
index de1e0d3a08f88b20a8f05ce1a269d2844a2b4e1e,5eddd563ab1bb2c855b299c2bc49ee63e47174db..e30c014c9d2cf0489816450208815a46b148643b
--- 1/src/gromacs/simd/tests/simd_math.cpp
--- 2/src/gromacs/simd/tests/simd_math.cpp
+++ b/src/gromacs/simd/tests/simd_math.cpp
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2014,2015,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2015,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/tables/cubicsplinetable.cpp
index 502b9bcb841de2806b5c52cd5d2b6810364c4473,8bcb4cf06bbf3a6ceb686a84af813734bda2cb50..da94daf08cd2e61cf329938a86f5569d6158b419
--- 1/src/gromacs/tables/cubicsplinetable.cpp
--- 2/src/gromacs/tables/cubicsplinetable.cpp
+++ b/src/gromacs/tables/cubicsplinetable.cpp
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/tables/cubicsplinetable.h
index c1122110bc39632d3a70d5a6cb31ab4360de88c4,02fbae5d69a654ddb005711423ec041f14266fe6..72e4c6399da3587e872627b21d9b2f9646ec7247
--- 1/src/gromacs/tables/cubicsplinetable.h
--- 2/src/gromacs/tables/cubicsplinetable.h
+++ b/src/gromacs/tables/cubicsplinetable.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-  * Copyright (c) 2016, by the GROMACS development team, led by
 - * Copyright (c) 2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/tables/quadraticsplinetable.cpp
index 7a85cda2353a6b952922d83c36cf57354f018334,fe69828cf84c799a6349673ec50219dc4d053701..de4487ad985b4522026bde5c1bfe06d8c58b4c86
--- 1/src/gromacs/tables/quadraticsplinetable.cpp
--- 2/src/gromacs/tables/quadraticsplinetable.cpp
+++ b/src/gromacs/tables/quadraticsplinetable.cpp
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/tables/splineutil.cpp
index 94c9228fe6f06e9c528175e3b306083ce827adf5,a023ec1fe111ef582221832c7e7f0bbf9b133d4e..1eb0001429c56e7ea9ffe63b49456d5097b01bac
--- 1/src/gromacs/tables/splineutil.cpp
--- 2/src/gromacs/tables/splineutil.cpp
+++ b/src/gromacs/tables/splineutil.cpp
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/tables/tests/splinetable.cpp
index e54a52d0d6971be7955ce295960926a85961b6f2,203a383ea55012458f48b5637900b84c8a0acb6e..afb40706b0188f445dfa14ee923658fa80043369
--- 1/src/gromacs/tables/tests/splinetable.cpp
--- 2/src/gromacs/tables/tests/splinetable.cpp
+++ b/src/gromacs/tables/tests/splinetable.cpp
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/taskassignment/resourcedivision.cpp
index 6154d6712781d0022ef32984e2f349030e9cfdab,015c8b68575771e7f078ccbcaa897aef394b21c3..497123c8b7b68dccd3a587bb3ee7fdd800842a0a
--- 1/src/gromacs/taskassignment/resourcedivision.cpp
--- 2/src/gromacs/taskassignment/resourcedivision.cpp
+++ b/src/gromacs/taskassignment/resourcedivision.cpp
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/taskassignment/resourcedivision.h
index 411335c4929427c1068abd28c52cde73007d9073,a2ef70feb01f002e0135e99da4d3fd556eb62363..d972c559eeb1fcb671c9de746d1b061d79086248
--- 1/src/gromacs/taskassignment/resourcedivision.h
--- 2/src/gromacs/taskassignment/resourcedivision.h
+++ b/src/gromacs/taskassignment/resourcedivision.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/tools/check.cpp
index 691d0b136d8b829d94cdb3b4578891d7fbcba0d0,6605352eae5d2e3e5b3c41f1da8abff21b27a4ae..d7429f6a2c40228e69bdc6b0ffd073e3dbe000b7
--- 1/src/gromacs/tools/check.cpp
--- 2/src/gromacs/tools/check.cpp
+++ b/src/gromacs/tools/check.cpp
@@@ -3,7 -3,7 +3,7 @@@
   *
   * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
   * Copyright (c) 2001-2013, The GROMACS development team.
-- * Copyright (c) 2013,2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/utility/basedefinitions.h
index 1c3e36c5da895c601ec318309249d02dd08507b5,a1638ef69c5b83cde0725260d645c15e494864ff..a43a8d344665022e77fcd1863940d0581689658e
--- 1/src/gromacs/utility/basedefinitions.h
--- 2/src/gromacs/utility/basedefinitions.h
+++ b/src/gromacs/utility/basedefinitions.h
@@@ -3,7 -3,7 +3,7 @@@
   *
   * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
   * Copyright (c) 2001-2004, The GROMACS development team.
-- * Copyright (c) 2013,2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/utility/coolstuff.cpp
index 8bcab77147bd0f26f4952f7558aaca0ac80aeb17,577e0a2de1aa75af4f86b8f6b059e7db8576b8ed..d95773c7d75298ad5416e0001a337cb1cae16db4
--- 1/src/gromacs/utility/coolstuff.cpp
--- 2/src/gromacs/utility/coolstuff.cpp
+++ b/src/gromacs/utility/coolstuff.cpp
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/gromacs/utility/tests/CMakeLists.txt
index 57cf2a19f199326019a87d5197a1f361855f8fa5,74ed8f471e943a65881c5554280c535bcb83fdea..0c67bc12ea798f3ee76c1eb00121bb71b630582b
--- 1/src/gromacs/utility/tests/CMakeLists.txt
--- 2/src/gromacs/utility/tests/CMakeLists.txt
+++ b/src/gromacs/utility/tests/CMakeLists.txt
@@@ -1,7 -1,7 +1,7 @@@
  #
  # This file is part of the GROMACS molecular simulation package.
  #
--# Copyright (c) 2012,2013,2014,2015,2016,2017, by the GROMACS development team, led by
++# Copyright (c) 2012,2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
  # Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  # and including many others, as listed in the AUTHORS file in the
  # top-level source directory and at http://www.gromacs.org.

diff --cc src/programs/mdrun/md.cpp
index 9604388c079c4816c219896a0d3b6edb17e2ee92,683460fa6b739be9d38c88b43337780aecf4dd2b..b874903548ee2c6e40851560ea1c3c19923c72b8
--- 1/src/programs/mdrun/md.cpp
--- 2/src/programs/mdrun/md.cpp
+++ b/src/programs/mdrun/md.cpp
@@@ -3,7 -3,7 +3,7 @@@
   *
   * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
   * Copyright (c) 2001-2004, The GROMACS development team.
-- * Copyright (c) 2011,2012,2013,2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2011,2012,2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/programs/mdrun/runner.cpp
Simple merge

diff --cc src/programs/mdrun/tests/pmetest.cpp
index 57ae23e152f422767b151c97c2ca13806a624c37,0c11b336b6df80b25ba03c11f83ee0dd5686de46..5a8cc48b38189c0a9bc01678327b392821001580
--- 1/src/programs/mdrun/tests/pmetest.cpp
--- 2/src/programs/mdrun/tests/pmetest.cpp
+++ b/src/programs/mdrun/tests/pmetest.cpp
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/testutils/cmdlinetest.cpp
index 5317d95b528505edf25368c722bc8ce9be3b09d4,2064b54c4efa65026e39593802677725c980e736..c95087a59bf0ed624b6ab27420a7029be4605644
--- 1/src/testutils/cmdlinetest.cpp
--- 2/src/testutils/cmdlinetest.cpp
+++ b/src/testutils/cmdlinetest.cpp
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2012,2013,2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2012,2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/testutils/cmdlinetest.h
index fc3fd4afaf0fb6f42214a4fcd8049604b066d1ea,3954a321d8b0e8b10b4c560de3a4539381d14751..ccef7598d3f3fa8539c30f0057917bd4ddac29ab
--- 1/src/testutils/cmdlinetest.h
--- 2/src/testutils/cmdlinetest.h
+++ b/src/testutils/cmdlinetest.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-- * Copyright (c) 2012,2013,2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2012,2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/testutils/testasserts.h
index c13c00ec569555c21931e3366ccb36a4bf300f82,c7ba7a4afe7589f5c35b396082bb9a537a736ea9..93fc616d6623ea9a1a2395c0520603a927c0122f
--- 1/src/testutils/testasserts.h
--- 2/src/testutils/testasserts.h
+++ b/src/testutils/testasserts.h
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-  * Copyright (c) 2013,2014,2015,2016, by the GROMACS development team, led by
 - * Copyright (c) 2013,2014,2015,2016,2017, by the GROMACS development team, led by
++ * Copyright (c) 2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc src/testutils/tests/testasserts_tests.cpp
index 01e9d6146da17abb74e72d9d68dc94605c583e89,d7175eae5270ca20843a7b6a4caf428d20235f31..4089f65d2b1b740a4e2191ab70c77ef3ab26b1af
--- 1/src/testutils/tests/testasserts_tests.cpp
--- 2/src/testutils/tests/testasserts_tests.cpp
+++ b/src/testutils/tests/testasserts_tests.cpp
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-  * Copyright (c) 2014, by the GROMACS development team, led by
 - * Copyright (c) 2014,2017, by the GROMACS development team, led by
++ * Copyright (c) 2014,2017,2018, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.

diff --cc tests/CMakeLists.txt
index 629d977dc48e644c89819d3ed3f471870d6fcb14,216652c8fb6dacf9df76f0a647a751443956a13a..7d0ea719bde159eaaf558d607679479ef8fb0af5
--- 1/tests/CMakeLists.txt
--- 2/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@@ -1,7 -1,7 +1,7 @@@
  #
  # This file is part of the GROMACS molecular simulation package.
  #
--# Copyright (c) 2012,2013,2014,2015,2016,2017, by the GROMACS development team, led by
++# Copyright (c) 2012,2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
  # Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  # and including many others, as listed in the AUTHORS file in the
  # top-level source directory and at http://www.gromacs.org.

diff --cc tests/CheckTarget.cmake
index 8c9fb49f69f3a5f520a4ec7f79b32858e35579ce,5e2f00eae3b6ca81d59b96308e8da5ffb2319aed..26eef1a18be306a830bdb770a3a746dceb9d5622
--- 1/tests/CheckTarget.cmake
--- 2/tests/CheckTarget.cmake
+++ b/tests/CheckTarget.cmake
@@@ -1,7 -1,7 +1,7 @@@
  #
  # This file is part of the GROMACS molecular simulation package.
  #
--# Copyright (c) 2014,2016,2017, by the GROMACS development team, led by
++# Copyright (c) 2014,2016,2017,2018, by the GROMACS development team, led by
  # Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  # and including many others, as listed in the AUTHORS file in the
  # top-level source directory and at http://www.gromacs.org.

diff --cc tests/CppCheck.cmake
index 1cc97127d373749cd3f2180d0f7393fcc82f5684,2cd46d2bbd296d3096b6fa0c3a06e4ff531701cb..9f1d658e6b0beaa9f37330c2c02589de9e597ff9
--- 1/tests/CppCheck.cmake
--- 2/tests/CppCheck.cmake
+++ b/tests/CppCheck.cmake
@@@ -1,7 -1,7 +1,7 @@@
  #
  # This file is part of the GROMACS molecular simulation package.
  #
--# Copyright (c) 2013,2014,2015,2016,2017, by the GROMACS development team, led by
++# Copyright (c) 2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
  # Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  # and including many others, as listed in the AUTHORS file in the
  # top-level source directory and at http://www.gromacs.org.