Marek Marczykowski 3171cdbdcc Merge branch 'master' into hvm ... Conflicts: dom0/qvm-core/qubes.py dom0/qvm-tools/qvm-create dom0/qvm-tools/qvm-prefs		2012-03-09 11:34:13 +01:00
dom0	Merge branch 'master' into hvm	2012-03-09 11:34:13 +01:00
misc	vm/dom-updates: always use --resolve	2012-03-02 00:34:36 +01:00
network	vm/netwatcher: fix watch	2012-03-09 01:54:16 +01:00
qrexec	vm(+dom0): major rearrage VM files in repo; merge core-*vm packages	2012-01-06 21:31:12 +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	Merge branch 'master' into hvm	2012-03-09 10:19:34 +01:00
u2mfn	gitignores	2011-03-23 19:57:48 -04:00
vchan	vchan: fix compile error	2012-02-27 14:58:46 +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/mimeopen: merge user defaults with system one (#423)	2012-02-06 19:09:37 +01: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_dom0	version 1.7.16	2012-03-08 21:45:55 +01:00
version_vaio_fixes	sony-vaio-fixes v1.6.1	2011-07-25 01:49:07 +02:00
version_vm	version 1.7.16	2012-03-08 21:45:55 +01:00