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)
commitcadbe84a76bf962574ad446b66153c74c7e69dd0
treecdeff9f71c2c0a5f5f0d7a6387e1639aa0b35d6c
parentb64f5db586b97d6f52b422a0edbcbcdadb0400fe
parent4f16cf51bc8b2aedffb8350582382c1203955335
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
bin/wham/wham_ifort_MPICH_GAB.exe
source/cluster/wham/src/Makefile
source/wham/src/cinfo.f