projects / unres.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8635adb 79d3073)
Merge branch 'devel' into bartek. Fixed conflicts in paramread.F and CMakeLists.txt
authorBartlomiej Zaborowski <bartek.zaborowski@chem.univ.gda.pl>
Wed, 10 Oct 2012 13:00:19 +0000 (15:00 +0200)
committerBartlomiej Zaborowski <bartek.zaborowski@chem.univ.gda.pl>
Wed, 10 Oct 2012 13:00:19 +0000 (15:00 +0200)
Conflicts:
source/unres/src_CSA_DiL/CMakeLists.txt
source/unres/src_CSA_DiL/parmread.F


Trivial merge
UNRESPACK 3.x