biod.pnpi.spb.ru
/
alexxy
/
gromacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c542f38
2aace06
)
Merge branch 'master' into rotation
author
Carsten Kutzner
<ckutzne@gwdg.de>
Mon, 8 Nov 2010 10:40:08 +0000
(11:40 +0100)
committer
Carsten Kutzner
<ckutzne@gwdg.de>
Mon, 8 Nov 2010 10:40:08 +0000
(11:40 +0100)
Conflicts:
src/tools/Makefile.am
Trivial merge