Merge release-4-6 into release-5-0
authorMark Abraham <mark.j.abraham@gmail.com>
Wed, 24 Jun 2015 21:33:24 +0000 (23:33 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Wed, 24 Jun 2015 21:36:18 +0000 (23:36 +0200)
commit368bdf6154423ed6e9ece5bf9866d28727b3d0b8
tree8f8cb97718f53cb883f8a730ad19d6a73be9a686
parentfadb3ecbf47b9b2d1cafbc9c09b3c9621ecd8d0f
parent83283df8937e8419452929b76dbedac9e0e90dd5
Merge release-4-6 into release-5-0

Change-Id: I6cc179f767cc4e0fc1dc3fc0b85428df986c16df
src/gromacs/gmxana/gmx_energy.c