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)
commitac32b72e6bb48e2caacd7fb88a270089889b2ef5
treeee4248f3615cf930a5e713431e0d5bbd4cbcf3a4
parentefc335abbfe06c4bb421d576e68f28b5ca5ca45c
parent1f73477edee0e310fd6af5b01644650a59b1bb17
Merge branch 'adasko' into devel

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