projects / unres.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2d33f82 7675ab8)
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)
Conflicts:
source/unres/src_MD/Makefile

1  2 
source/unres/src_MD/CMakeLists.txt patch | diff1 | diff2 | blob | history
source/unres/src_MD/readrtns.F patch | diff1 | diff2 | blob | history

diff --cc source/unres/src_MD/CMakeLists.txt
Simple merge
diff --cc source/unres/src_MD/readrtns.F
Simple merge
UNRESPACK 3.x