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
..
audio	Merge branch 'master' into stdenv-updates	2013-03-02 10:41:53 +01:00
display-managers/slim	consolekit: Remove	2012-12-13 11:30:18 +01:00
editors	Re-generate all Haskell packages with the latest version of cabal2nix.	2013-02-25 00:32:40 +01:00
graphics	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
misc	Merge branch 'master' into stdenv-updates	2013-03-02 10:41:53 +01:00
networking	Merge branch 'master' into stdenv-updates	2013-03-02 10:41:53 +01:00
office	koffice, kbluetooth: remove from hydra	2013-03-02 09:21:11 +01:00
science	qucs: minor update and fix for new gcc	2013-02-24 15:11:19 +01:00
taxes	* It's that time of year again.	2012-03-10 19:23:04 +00:00
version-management	Merge branch 'master' into stdenv-updates	2013-03-02 10:41:53 +01:00
video	add nasm to xbmc dependencies	2013-02-16 23:23:15 +01:00
virtualization	Merge branch 'master' into stdenv-updates	2013-03-02 10:41:53 +01:00
window-managers	Merge branch 'master' into stdenv-updates	2013-03-02 10:41:53 +01:00