Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. ... Conflicts: pkgs/desktops/e18/enlightenment.nix		2014-08-04 16:51:47 +02:00
..
build-app.nix	Support app names with white spaces	2014-08-04 11:23:55 +02:00
default.nix
install.html.template	Use hyperlink and click action instead of meta refresh	2014-08-01 19:26:34 +02:00
simulate-app.nix
xcodewrapper.nix