Merge release-4-6 into master
authorRoland Schulz <roland@utk.edu>
Mon, 3 Mar 2014 20:31:54 +0000 (15:31 -0500)
committerRoland Schulz <roland@utk.edu>
Mon, 3 Mar 2014 20:39:24 +0000 (15:39 -0500)
commit30d8f2ea18e307e14e7f0721733cc7447cb226da
treee706854a6a0432b69a855c0b4c2e45fb13395494
parent6acea3c7f04ec41659472a9cb03aec67e788d91d
parenta56228accb8dc04c7ef08fe6bfc7518da43c218d
Merge release-4-6 into master

Conflicts:
admin/installguide/installguide.tex

3643d2a Add fatal error for Andersen+constraints+DD ignored
because already in master.

Change-Id: I6b3346503036e5b31bcc929daa5bcc9a04dde3bc
admin/installguide/installguide.tex
src/gromacs/gmxpreprocess/readir.c
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh
src/gromacs/trajectoryanalysis/modules/nsc.c