Carles Pagès 6c949148b6 Merge remote-tracking branch 'upstream/x-updates' into wayland ... Conflicts: pkgs/development/libraries/mesa/default.nix pkgs/top-level/all-packages.nix		2013-03-10 18:19:49 +01:00
..
audio	applications/audio/caps: New nixpkg.	2013-03-09 17:54:59 +04: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 branch 'master' into x-updates	2013-03-09 17:55:37 +01:00
misc	Merge branch 'master' into x-updates	2013-03-09 17:55:37 +01:00
networking	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-03-07 19:33:52 +01:00
office	Merge branch 'master' into x-updates	2013-03-09 17:55:37 +01:00
science	Merge branch 'master' into x-updates	2013-03-09 17:55:37 +01:00
taxes	* It's that time of year again.	2012-03-10 19:23:04 +00:00
version-management	Merge branch 'master' into x-updates	2013-03-09 17:55:37 +01:00
video	Merge branch 'makemkv.130223.0' of git://github.com/jcumming/nixpkgs	2013-03-08 17:26:53 -05:00
virtualization	Merge branch 'master' into stdenv-updates	2013-03-02 10:41:53 +01:00
window-managers	Merge remote-tracking branch 'upstream/x-updates' into wayland	2013-03-10 18:19:49 +01:00