merge...
authorAdam Sieradzan <adasko@mmka.chem.univ.gda.pl>
Wed, 7 Aug 2013 16:05:10 +0000 (18:05 +0200)
committerAdam Sieradzan <adasko@mmka.chem.univ.gda.pl>
Wed, 7 Aug 2013 16:05:10 +0000 (18:05 +0200)
commit3c03fd5940ff7763df81f199e24355093f70c6fe
treea464f44157b05fd6e6b3c1480afa01b8f907eab0
parent7180203f4938cc8151a53de9ce354283a63ee435
parentaee20d3590dc2913e3a9a4308ce5da7787993a66
merge...
Merge branch 'prerelease-3.2.1' of mmka:unres into prerelease-3.2.1

Conflicts:

source/wham/src/energy_p_new.F
source/wham/src/energy_p_new.F
source/wham/src/wham_calc1.F