git://git.onelab.eu / sliver-openvswitch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 093f56c 6647cb8)
Merge branch 'mainstream'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Fri, 25 Oct 2013 20:15:00 +0000 (22:15 +0200)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Fri, 25 Oct 2013 20:15:00 +0000 (22:15 +0200)
1  2 
Makefile.am patch | diff1 | diff2 | blob | history
lib/automake.mk patch | diff1 | diff2 | blob | history
lib/dpif-netdev.c patch | diff1 | diff2 | blob | history

diff --cc Makefile.am
index 32e85d1,b1ad24d..d8cc733
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -274,5 -276,5 +277,6 @@@ include rhel/automake.m
  include xenserver/automake.mk
  include python/automake.mk
  include python/compat/automake.mk
 +include planetlab/automake.mk
  include tutorial/automake.mk
+ include vtep/automake.mk
diff --cc lib/automake.mk
Simple merge
diff --cc lib/dpif-netdev.c
Simple merge
sliver-openvswitch