biod.pnpi.spb.ru
/
alexxy
/
gromacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0616e87
0e52c90
)
Merge commit '0e52c9073c31ddc1cdc23f0cbf867ad1c9e72524' into cpp-migration
author
Teemu Murtola
<teemu.murtola@cbr.su.se>
Sun, 26 Dec 2010 16:26:31 +0000
(18:26 +0200)
committer
Teemu Murtola
<teemu.murtola@cbr.su.se>
Sun, 26 Dec 2010 16:26:31 +0000
(18:26 +0200)
Used merge strategy ours to keep the manual renames and other work from
the previous commit.
Trivial merge