projects
/
unres.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c8e86e2
39d8ca8
)
Merge branch 'devel' into bartek. Fixed conflicts in paramread.F and CMakeLists.txt
author
Bartlomiej Zaborowski
<bartek.zaborowski@chem.univ.gda.pl>
Wed, 10 Oct 2012 13:00:19 +0000
(15:00 +0200)
committer
Bartlomiej 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