Vladimír Čunát 26af997d41 Merge branch 'master' into stdenv-updates ... Conflicts (simple): pkgs/applications/networking/browsers/chromium/default.nix pkgs/development/libraries/libsoup/default.nix pkgs/os-specific/linux/kernel/manual-config.nix pkgs/os-specific/linux/qemu-kvm/default.nix		2013-03-02 10:41:53 +01: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-03-02 10:41:53 +01:00
glibc-2.16-use-siginfo_t.patch	chromium: Fix build	2013-01-29 13:14:52 +01:00
pulseaudio_array_bounds.patch	chromium: Add support for pulseaudio.	2012-06-22 15:53:30 -04:00
sources.nix	chromium: Update stable channel to v25.0.1364.97.	2013-02-28 01:16:50 +01:00
update.sh	chromium: Fix updater to handle versions > 26.	2013-02-08 07:03:36 +01:00