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	install iptables/forwarding for debian	2014-09-29 05:25:14 +02:00
filter-updates	debian: Updated tinyproxy filter rules	2014-11-11 13:38:26 -05:00
ip6tables	vm/iptables: block IPv6 traffic	2012-09-25 16:14:06 +02:00
iptables	firewall: replace deprecated "state" iptables module with "conntrack"	2014-03-28 02:56:43 +01:00
iptables-updates-proxy	Rename qubes-yum-proxy service to qubes-updates-proxy	2014-09-27 00:32:52 +02:00
network-manager-prepare-conf-dir	network: do not use ifcfg-rh NM plugin	2014-11-09 05:31:22 +01:00
qubes-firewall	Merge branch 'debian'	2015-01-30 00:30:24 +01:00
qubes-fix-nm-conf.sh	The Underscores Revolution: filenames	2013-03-14 01:07:49 +01:00
qubes-netwatcher	various patches for debian	2014-09-29 05:25:24 +02:00
qubes-nmhook	The Underscores Revolution: filenames	2013-03-14 01:07:49 +01:00
qubes-setup-dnat-to-ns	various patches for debian	2014-09-29 05:25:24 +02:00
setup-ip	Merge branch 'debian'	2015-01-30 00:30:24 +01:00
show-hide-nm-applet.desktop	Hide nm-applet when NetworkManager is disabled (retry)	2014-02-07 02:16:39 +01:00
show-hide-nm-applet.sh	Fix bashism	2014-07-26 03:58:21 +02:00
tinyproxy-updates.conf	Rename qubes-yum-proxy service to qubes-updates-proxy	2014-09-27 00:32:52 +02:00
udev-qubes-network.rules	The Underscores Revolution: filenames	2013-03-14 01:07:49 +01:00
vif-route-qubes	Use Qubes DB instead of Xenstore	2014-11-19 15:34:33 +01:00