Marek Marczykowski eb0fd31bf4 Merge branch 'master' of ssh://git.qubes-os.org/var/lib/qubes/git/joanna/template-builder ... Conflicts: appmenus/whitelisted-appmenus.list		2011-07-11 20:43:10 +02:00
..
clean-volatile.img.tar	Leave tar-ed volatile.img (#118)	2011-03-24 13:04:43 +01:00
network	fedorize_image: install /etc/sysconfig/network and resolv.conf files	2010-06-20 22:16:30 +02:00
packages.list	Merge branch 'master' of ssh://git.qubes-os.org/var/lib/qubes/git/joanna/template-builder	2011-07-11 20:43:10 +02:00
part.bin	the fedorize_image script	2010-06-19 02:27:12 +02:00
resolv.conf	fedorize_image: install /etc/sysconfig/network and resolv.conf files	2010-06-20 22:16:30 +02:00