projects / osm / vim-emu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff6b404 bc69b3a)
Merge remote-tracking branch 'upstream/master'
authorstevenvanrossem <steven.vanrossem@intec.ugent.be>
Thu, 14 Jul 2016 18:52:18 +0000 (20:52 +0200)
committerstevenvanrossem <steven.vanrossem@intec.ugent.be>
Thu, 14 Jul 2016 18:52:18 +0000 (20:52 +0200)
1  2 
README.md patch | diff1 | diff2 | blob | history
setup.py patch | diff1 | diff2 | blob | history
utils/vagrant/motd patch | diff1 | diff2 | blob | history

diff --cc README.md
Simple merge
diff --cc setup.py
Simple merge
diff --cc utils/vagrant/motd
index ea9e8ca,df6b388..df6b388
mode 100755,100644..100755
--- 1/utils/vagrant/motd
--- 2/utils/vagrant/motd
+++ b/utils/vagrant/motd