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
..
default.nix	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
sandbox_userns_36.patch	chromium: Update all channels to latest versions.	2014-06-19 01:51:34 +02:00
sources.nix	chromium: Update beta and dev to latest versions.	2014-08-04 07:50:19 +02:00
update.nix	chromium/update: Fix fetching previous version.	2014-06-19 01:51:35 +02:00