Merge branch 'devel' of mmka:unres into devel
authorCezary Czaplewski <czarek@chem.univ.gda.pl>
Mon, 2 Sep 2013 13:20:28 +0000 (15:20 +0200)
committerCezary Czaplewski <czarek@chem.univ.gda.pl>
Mon, 2 Sep 2013 13:20:28 +0000 (15:20 +0200)
commit4d1af7875f88832552e868c042c6988762d80110
treefb7a6938462ebdf5d72bf4619824fade07f30d53
parent492cd1b490a2e0259b8e9447eac11a9466cf6df9
parentf3fb02dcb801d48f6bdc6f48c78bc8a3a2c7fb97
Merge branch 'devel' of mmka:unres into devel

Conflicts:
source/unres/src_MD/CMakeLists.txt
source/unres/src_MD/CMakeLists.txt