2 Commits

Author	SHA1	Message	Date
Rafal Wojtczuk	dfb499c025	Merge branch 'blockless' into spring-merge ... Conflicts: appvm/Makefile appvm/qubes_core netvm/qubes_core rpm_spec/core-appvm.spec rpm_spec/core-netvm.spec	2011-03-21 13:54:35 +01:00
Marek Marczykowski	c87b15ba2a	NetVM, AppVM, ProxyVM from single template - VM side ... Modify VM packages to: - do not conflicts - starts services if its VM type need it Added core-proxyvm (firewall) and core-commonvm (common parts) packages.	2011-03-11 01:38:04 +01:00