git://git.onelab.eu / sliver-openvswitch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e40686f 559eb23)
Merge commit '559eb2308b4d616590aba34bb8f4dd7f12ae4587'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Fri, 5 Jul 2013 17:36:43 +0000 (19:36 +0200)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Fri, 5 Jul 2013 17:36:43 +0000 (19:36 +0200)
Conflicts:
Makefile.am

1  2 
Makefile.am patch | diff1 | diff2 | blob | history
lib/dpif-netdev.c patch | diff1 | diff2 | blob | history

diff --cc Makefile.am
index 5dce7aa,36beb6c..b15a9a4
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -259,4 -258,4 +259,5 @@@ 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
diff --cc lib/dpif-netdev.c
Simple merge
sliver-openvswitch