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
..
core-vm-doc.spec	Move manpages here from separate repo	2013-03-12 17:10:49 +01:00
core-vm-kernel-placeholder.spec	rpm: own /lib/modules only in Fedora >= 19	2013-12-22 23:00:21 +01:00
core-vm.spec	Merge branch 'debian'	2015-01-30 00:30:24 +01:00