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)
commit5316f1d82cb17d390be734cefbfca809cc65dcc4
treee6499449a3b07ef4534b3c6e1f487fe638e1ebc1
parent2d33f82339bda8759795452c7e56f5c4ecb31edc
parent7675ab8ec26554f2fd3f2e7e427b177254872a45
Merge branch 'adasko' into devel

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