projects
/
osm
/
vim-emu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
eb398a2
dcc7954
)
Merge remote-tracking branch 'upstream/master' into demo-mano-integration
author
peusterm
<manuel.peuster@uni-paderborn.de>
Mon, 19 Jun 2017 10:56:07 +0000
(12:56 +0200)
committer
peusterm
<manuel.peuster@uni-paderborn.de>
Mon, 19 Jun 2017 10:56:07 +0000
(12:56 +0200)
Trivial merge