biod.pnpi.spb.ru
/
alexxy
/
gromacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
5750bfe
)
Merge branch release-5-1
author
Mark Abraham
<mark.j.abraham@gmail.com>
Fri, 24 Jul 2015 14:40:41 +0000
(16:40 +0200)
committer
Mark Abraham
<mark.j.abraham@gmail.com>
Fri, 24 Jul 2015 14:40:41 +0000
(16:40 +0200)
Conflicts:
src/gromacs/commandline/shellcompletions.cpp
Removed line no longer appropriate, now that zsh completion
is supported. Master had changed the previous line, which
git flags as a merge conflict.
Change-Id: Id9d37615b2bd121b1206ca0e6e8eac62fcf38f01
No differences found
biod.pnpi.spb.ru / alexxy / gromacs.git / commitdiff