Merge branch 'devel' of mmka.chem.univ.gda.pl:unres into devel
authorAdam Liwo <jal47@matrix.chem.cornell.edu>
Thu, 20 Sep 2012 12:55:41 +0000 (08:55 -0400)
committerAdam Liwo <jal47@matrix.chem.cornell.edu>
Thu, 20 Sep 2012 12:55:41 +0000 (08:55 -0400)
commite2f8fe07e0e55343147e2fee2348d325c0ce589a
tree84982ba700a944705a683567742ba4039ca26192
parent8893a1b93e875425e4b7ceb78242d488665af7b8
parent789c3168cf245966e8024c5e7f73785d608fac34
Merge branch 'devel' of mmka.chem.univ.gda.pl:unres into devel

Conflicts:
bin/wham/wham_ifort_MPICH_GAB.exe