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)
commitf8ad83534ea93051b67c00eb1b4fa6a2c42e1d8a
tree84982ba700a944705a683567742ba4039ca26192
parenta41620c39be26bb01dc5c7306257d7c67f03cfcf
parentfeb7335579e8c091b7f89b836b5534707e1fb25d
Merge branch 'devel' of mmka.chem.univ.gda.pl:unres into devel

Conflicts:
bin/wham/wham_ifort_MPICH_GAB.exe