diff options
| author | Michael Biebl <biebl@debian.org> | 2010-12-05 04:26:47 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2010-12-05 04:26:47 +0100 |
| commit | 602ec1e2e06c6cbb92dc2da2ab2ebfe433a7ef94 (patch) | |
| tree | c3e336e21ad50568e8c9775195d43734a8e50360 /debian/patches/series | |
| parent | 29b523273500fbeeb296763e7de0a2aea9476772 (diff) | |
| parent | 44eff6984a48b7ef12115ab6f06c1199f969efcc (diff) | |
Merge branch 'master' into experimental
Conflicts: debian/changelog debian/patches/series
Diffstat (limited to 'debian/patches/series')
| -rw-r--r-- | debian/patches/series | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/patches/series b/debian/patches/series index c40ab33b..ac7dabee 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,4 @@ # Debian patches for network-manager 02-dbus_access_network_manager.patch +40-umanaged-interfaces.patch +50-bridge-interfaces.patch |