Merge branch 'adasko' into devel
authorAdam Kazimierz Sieradzan <adasko@sun1.chem.univ.gda.pl>
Mon, 18 Jun 2012 10:22:21 +0000 (06:22 -0400)
committerAdam Kazimierz Sieradzan <adasko@sun1.chem.univ.gda.pl>
Mon, 18 Jun 2012 10:22:21 +0000 (06:22 -0400)
commit478f5fd9e95bd5665ab58ee691f517d7dab379b3
tree21e22f1d1af1562ed7bc4f352a253b7595111744
parentfd1901c40611f2f95c5c488b9ebc6a291b927d25
parente3327e6cd63c981580740d89041035021f94b9ed
Merge branch 'adasko' into devel

Conflicts:
.gitignore
.gitignore
source/unres/src_MD/energy_p_new_barrier.F
source/unres/src_MD/readrtns.F