git://git.onelab.eu / sliver-openvswitch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ac60863 3458273)
Merge branch 'mainstream'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Tue, 26 Nov 2013 15:56:56 +0000 (16:56 +0100)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Tue, 26 Nov 2013 15:56:56 +0000 (16:56 +0100)
1  2 
Makefile.am patch | diff1 | diff2 | blob | history

diff --cc Makefile.am
Simple merge
sliver-openvswitch