Shea Levy acd4299e75 Merge branch 'master' into stdenv-updates ... Conflicts: pkgs/applications/networking/browsers/chromium/default.nix pkgs/top-level/all-packages.nix Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.		2013-02-21 11:13:30 -05:00
..
clone_detached.patch	chromium: Update dev channel to v26.0.1410.5.	2013-02-20 23:40:45 +01:00
cups_allow_deprecated.patch	chromium: Implement handling of enableCUPS.	2012-06-22 15:53:29 -04:00
default.nix	Merge branch 'master' into stdenv-updates	2013-02-21 11:13:30 -05:00
glibc-2.16-use-siginfo_t.patch	chromium: Fix build	2013-01-29 13:14:52 +01:00
pulse_audio_fix.patch	chromium: Add pulse_audio_fix.patch to nixpkgs.	2013-01-10 03:29:44 +01:00
pulseaudio_array_bounds.patch	chromium: Add support for pulseaudio.	2012-06-22 15:53:30 -04:00
sources.nix	chromium: Update dev channel to v26.0.1410.5.	2013-02-20 23:40:45 +01:00
update.sh	chromium: Fix updater to handle versions > 26.	2013-02-08 07:03:36 +01:00