Marek Marczykowski 8f7cd6e650 Merge branch 'master' into hvm ... Conflicts: dom0/qvm-tools/qvm-prefs dom0/qvm-tools/qvm-start version_dom0 version_vm		2012-04-18 17:12:11 +02:00
misc	Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core	2012-04-15 16:21:50 +02:00
network	vm/netwatcher: fix watch	2012-03-09 01:54:16 +01:00
qubes_rpc	vm: do not ignore file extension when selecting file editor (#423)	2012-02-06 15:03:43 +01:00
rpm_spec	vm/init.d: make firewall and netwatcher service consistent with systemd	2012-03-09 01:50:18 +01:00
vm-init.d	vm/init.d: make firewall and netwatcher service consistent with systemd	2012-03-09 01:50:18 +01:00
vm-systemd	vm/init: Use the same default services for TemplateVM as for AppVM (#503)	2012-03-28 00:43:59 +02:00
.gitignore	gitignore files - add build products	2011-03-06 14:06:24 +01:00
LICENSE	Added LICENSE	2010-04-05 21:21:27 +02:00
Makefile	Makefile: network doesn't require clean	2012-01-15 17:36:35 +01:00
version_vaio_fixes	sony-vaio-fixes v1.6.1	2011-07-25 01:49:07 +02:00
version_vm	version 1.7.19	2012-04-15 16:22:22 +02:00