2 Commits

Author	SHA1	Message	Date
Marek Marczykowski	d6181d21cf	Merge commit 'e2d52a27e810522c41720bb17b1f4f52f1fe2e6a' ... Conflicts: dom0/qvm-core/qubes.py fwvm/init.d/qubes_firewall	2011-03-11 23:32:13 +01:00
Marek Marczykowski	c7a832a279	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