5 commits

Author	SHA1	Message	Date
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
Matej Cotman	b1ba1689bd	zed: build from source, ditch the installer, upgrade node-webkit	2014-07-30 12:43:24 +02:00
Eelco Dolstra	40f7b0f9df	Another attempt to eradicate ensureDir ... See c556a6ea46.	2014-06-30 14:56:10 +02:00
Jaka Hudoklin	d0c0132fb0	node_webkit: fix hash for i686-linux	2014-04-19 10:45:03 +01:00
Jaka Hudoklin	58e0383d93	Add node-webkit, app runtime based on Chromium and node.js	2014-03-15 09:43:56 +00:00