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)
commit80ccfedfd50c0d57ff16f37f31903809f747bc11
treecdeff9f71c2c0a5f5f0d7a6387e1639aa0b35d6c
parent78a9d156c8b3e7bb90330946fb263e3b66391939
parentedab12f52f383e09c1e77f0704f8ef58e0ecdf33
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