Merge release-4-5-patches into release-4-6
authorRoland Schulz <roland@utk.edu>
Sun, 29 Apr 2012 01:45:00 +0000 (21:45 -0400)
committerRoland Schulz <roland@utk.edu>
Sun, 29 Apr 2012 01:47:06 +0000 (21:47 -0400)
commit20e2eb1b80ac260174f6b19d803060e0e544049b
tree5836a3c12aa17d9841de9fbad4812741256f89df
parent726f688fc6034bb542b3249ceeeafc4594351e74
parent441839bc6b149a8eac7081053a78c10050dbd6d4
Merge release-4-5-patches into release-4-6

Conflicts:
src/mdlib/pme.c

Change-Id: I0a77a63162168d3a07ab957a9bf7b367a9f05eac
CMakeLists.txt
src/mdlib/fft5d.c
src/mdlib/minimize.c
src/mdlib/pme.c