Merge release-4-5-patches into release-4-6
authorRoland Schulz <roland@utk.edu>
Tue, 26 Mar 2013 19:15:20 +0000 (15:15 -0400)
committerRoland Schulz <roland@utk.edu>
Tue, 26 Mar 2013 19:15:20 +0000 (15:15 -0400)
commitd4e96c5f971f37566e159e3b4b32cb189de77714
tree9c5b70e12bc8f1c71b84f30ae22982d87c254ed3
parent7c965df5a77e7c2c33e62a572aa64c548dba9be8
parent90abdcf9a41e447da7f4e66baba23caf3e10d461
Merge release-4-5-patches into release-4-6

Conflicts:
CMakeLists.txt
configure.ac
src/tools/gmx_mindist.c

Change-Id: I303318f17527a8e1bfe494eb174565b8d5491870
src/tools/gmx_mindist.c