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
..
convert_app2template.sh	Include templates for all appmenus in package (#266)	2011-07-11 20:39:58 +02:00
vm-whitelisted-appmenus.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
whitelisted-appmenus.list	Include templates for all appmenus in package (#266)	2011-07-11 20:39:58 +02:00