Marek Marczykowski-Górecki 9130636c88 Merge branch 'debian' ... Conflicts: misc/qubes-r2.list.in misc/qubes-trigger-sync-appmenus.sh network/30-qubes-external-ip network/qubes-firewall vm-systemd/network-proxy-setup.sh vm-systemd/prepare-dvm.sh vm-systemd/qubes-sysinit.sh		2015-01-30 00:30:24 +01:00
..
30-qubes-external-ip	Merge branch 'debian'	2015-01-30 00:30:24 +01:00
80-qubes.conf
filter-updates
ip6tables
iptables
iptables-updates-proxy
network-manager-prepare-conf-dir
qubes-firewall	Merge branch 'debian'	2015-01-30 00:30:24 +01:00
qubes-fix-nm-conf.sh
qubes-netwatcher
qubes-nmhook
qubes-setup-dnat-to-ns
setup-ip	Merge branch 'debian'	2015-01-30 00:30:24 +01:00
show-hide-nm-applet.desktop
show-hide-nm-applet.sh
tinyproxy-updates.conf
udev-qubes-network.rules
vif-route-qubes