Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size ... Beware that stdenv doesn't build. It seems something more will be needed than just resolution of merge conflicts.		2016-04-01 10:06:01 +02:00
..
patches	chromium/source: Move patches into its own subdir	2016-03-20 16:44:34 +01:00
browser.nix	chromium: Revert working around --sysroot filter	2016-03-20 21:05:49 +01:00
common.nix	Merge branch 'master' into closure-size	2016-04-01 10:06:01 +02:00
default.nix	chromium: Move source/default.nix into common.nix	2016-03-20 17:50:17 +01:00
plugins.nix	Merge branch 'master' into closure-size	2016-04-01 10:06:01 +02:00
update.nix	chromium: Move source/default.nix into common.nix	2016-03-20 17:50:17 +01:00
update.sh	chromium/source: Move update.nix to parent dir	2016-03-20 16:53:08 +01:00
upstream-info.nix	chromium: Fix comment of upstream-info.nix	2016-03-20 23:10:13 +01:00