Merge branch 'adasko' into devel
authorAdam Sieradzan <adasko@piasek2.(none)>
Tue, 5 Nov 2013 13:51:57 +0000 (14:51 +0100)
committerAdam Sieradzan <adasko@piasek2.(none)>
Tue, 5 Nov 2013 13:51:57 +0000 (14:51 +0100)
commit56083f90a84f3e7b1ca4d288c940e368bb5390ee
tree6b905b26440b71efc9541382ce71a866f5a5d30f
parentf5a9e806544f8c34fca5bbd15a38134e04b93831
parent462b4b0ab826c82da8fbe9e4425f5329306b1952
Merge branch 'adasko' into devel

Conflicts:
source/unres/src_MD/Makefile
source/unres/src_MD/CMakeLists.txt
source/unres/src_MD/readrtns.F