git://git.onelab.eu / sliver-openvswitch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f263172 deaa298)
Merge branch 'mainstream'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Tue, 10 Dec 2013 13:38:28 +0000 (14:38 +0100)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Tue, 10 Dec 2013 13:38:28 +0000 (14:38 +0100)
1  2 
lib/automake.mk patch | diff1 | diff2 | blob | history

diff --cc lib/automake.mk
Simple merge
sliver-openvswitch