Joanna Rutkowska 00b0bd6d42 Merge branch 'master' of git://git.qubes-os.org/joanna/core into hvm ... Conflicts: version_dom0 version_vm		2012-03-02 02:24:37 +01:00
misc	vm/yum.repo: use separate key for unstable repo	2012-02-26 13:10:04 +01:00
network	vm/network: do not fail when route already exists - override it	2012-02-24 17:10: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/mimeopen: save mimetype defaults for DispVM (#423)	2012-02-06 19:08:08 +01:00
vm-init.d	vm/mimeopen: merge user defaults with system one (#423)	2012-02-06 19:09:37 +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_vaio_fixes	sony-vaio-fixes v1.6.1	2011-07-25 01:49:07 +02:00
version_vm	version 2.0.2	2012-03-01 12:46:18 +01:00