Merge branch 'prerelease-3.2.1' of mmka.chem.univ.gda.pl:unres into prerelease-3.2.1
authorAdam Kazimierz Sieradzan <adasko@sun1.chem.univ.gda.pl>
Sat, 31 Aug 2013 09:28:36 +0000 (05:28 -0400)
committerAdam Kazimierz Sieradzan <adasko@sun1.chem.univ.gda.pl>
Sat, 31 Aug 2013 09:28:36 +0000 (05:28 -0400)
1  2 
source/wham/src/energy_p_new.F

Simple merge