projects
/
osm
/
vim-emu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
42c44b4
b5e1c89
)
Merge remote-tracking branch 'upstream/master' into demo-mano-integration
author
peusterm
<manuel.peuster@uni-paderborn.de>
Tue, 13 Jun 2017 11:41:33 +0000
(13:41 +0200)
committer
peusterm
<manuel.peuster@uni-paderborn.de>
Tue, 13 Jun 2017 11:41:33 +0000
(13:41 +0200)
Trivial merge