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
..
source	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
browser.nix	Another attempt to eradicate ensureDir	2014-06-30 14:56:10 +02:00
common.nix	chromium: Update all channels to latest versions.	2014-07-28 15:58:14 +02:00
default.nix	Another attempt to eradicate ensureDir	2014-06-30 14:56:10 +02:00
plugins.nix	Another attempt to eradicate ensureDir	2014-06-30 14:56:10 +02:00
sandbox.nix	chromium: Update beta and dev to latest versions.	2014-04-20 17:45:24 +02:00
update.sh	chromium: Move update.sh back into the main path.	2014-04-20 17:45:25 +02:00