Merge branch 'devel' into adam
authorAdam Liwo <jal47@matrix.chem.cornell.edu>
Wed, 18 Jul 2012 10:34:03 +0000 (06:34 -0400)
committerAdam Liwo <jal47@matrix.chem.cornell.edu>
Wed, 18 Jul 2012 10:34:03 +0000 (06:34 -0400)
commit475cb7c804600f032f66948452d6e47d1083e59b
tree2a564408777bbf68417769870e3ef9c5007b4a8b
parentdb3878257078d375f326e84976bdac6a666602df
parent12e13b509edc89a3bededfe641edfbb944463ad3
Merge branch 'devel' into adam

Conflicts:
bin/wham/wham_ifort_MPICH_GAB.exe
source/cluster/wham/src/Makefile
source/unres/src_MD/cinfo.f
source/wham/src/cinfo.f
source/cluster/wham/src/Makefile
source/wham/src/cinfo.f