Parnell Springmeyer a26a796d5c Merging against master - updating smokingpig, rebase was going to be messy		2017-01-26 02:00:04 -08:00
..
patches
browser.nix	Fix big-parallel usage	2017-01-03 13:55:26 +01:00
common.nix	chromium: use python2	2016-11-24 22:28:04 +01:00
default.nix	More fixes and improvements	2017-01-26 00:05:40 -08:00
plugins.nix	flashplayer: 24.0.0.186 -> 24.0.0.194	2017-01-11 18:06:55 +00:00
update.nix	chromium: fix nix syntax highlighting for emacs	2016-11-10 16:30:56 +01:00
update.sh
upstream-info.nix	chromium: 55.0.2883.75 -> 55.0.2883.87	2017-01-02 14:00:10 +01:00