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)
commitf41440fa4f390cce94e937da5973342953d99fbd
tree9b3b2b5a10ab3c3e34da5b3104697a686c0d6280
parent32aa6688d724b87f0e552e7af4f8d5de80443844
parent10a549c2ed1dc28e21fcf8b7b4cabcdfdaff183d
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