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)
commitc31fc30c9830b0e505fc4c5af6d07e13be4f3078
tree0ddfa52d4b67f453baf3a88b508fa46b4722dbee
parentc2b8becc759571af9f6dd36d48a2f7b16037925b
parent8a83599899baca3e854c707d8621b7cc77bdf22f
Merge branch 'devel' of mmka.chem.univ.gda.pl:unres into devel

Conflicts:
bin/wham/wham_ifort_MPICH_GAB.exe
bin/wham/wham_ifort_MPICH_GAB.exe