git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit '559eb2308b4d616590aba34bb8f4dd7f12ae4587'
[sliver-openvswitch.git]
/
debian
/
copyright.in
diff --git
a/debian/copyright.in
b/debian/copyright.in
index
94caa87
..
a1a2c3c
100644
(file)
--- a/
debian/copyright.in
+++ b/
debian/copyright.in
@@
-8,10
+8,11
@@
Upstream Authors (from AUTHORS):
Upstream Copyright Holders:
Upstream Copyright Holders:
- Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012 Nicira
Networks
.
+ Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012 Nicira
, Inc
.
Copyright (c) 2010 Jean Tourrilhes - HP-Labs.
Copyright (c) 2008,2009,2010 Citrix Systems, Inc.
and authors listed above.
Copyright (c) 2010 Jean Tourrilhes - HP-Labs.
Copyright (c) 2008,2009,2010 Citrix Systems, Inc.
and authors listed above.
+ Copyright (c) 2011 Gaetano Catalli
License:
License:
@@
-75,9
+76,7
@@
License:
GNU General Public License version 2 and the Apache License Version 2.0.
include/linux/openvswitch.h
GNU General Public License version 2 and the Apache License Version 2.0.
include/linux/openvswitch.h
- include/openvswitch/brcompat-netlink.h
include/openvswitch/datapath-compat.h
include/openvswitch/datapath-compat.h
- include/openvswitch/tunnel.h
On Debian systems, the complete text of the GNU General Public License
version 2 can be found in `/usr/share/common-licenses/GPL-2'.
On Debian systems, the complete text of the GNU General Public License
version 2 can be found in `/usr/share/common-licenses/GPL-2'.