Merge branch 'master' into multichain
authorAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Tue, 24 Feb 2015 11:10:50 +0000 (12:10 +0100)
committerAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Tue, 24 Feb 2015 11:10:50 +0000 (12:10 +0100)
commit33ca65593386f7dce46c59efeb0f77b996757cbf
treebd2abc2d6bdf679c05ad8c6cf4e9adea53da0e28
parent9b46e3da575cb549a4070ee7d0c75efc729951e6
parent78c6b598700d2c701af6532afb20ebc905a0b8ef
Merge branch 'master' into multichain

Conflicts:
.gitignore
source/unres/src_MD-M/energy_p_new_barrier.F
.gitignore
source/unres/src_MD-M/energy_p_new_barrier.F
source/unres/src_MD-M/parmread.F