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)
commit9599888d279b89c6e0ed41d57caf7160fc54f9e3
tree0ddfa52d4b67f453baf3a88b508fa46b4722dbee
parentffdab8e1a4782a031ac72eef5416fd12a1dd3722
parent7f0d0e5fd989a56e8e969b0ead7aef311b290f51
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