nixpkgs/pkgs/applications
Vladimír Čunát 0d72174dbd Merge branch stdenv-updates into x-updates
x-updates is supposed to merge after stdenv-updates, so let's test it

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
	pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
2013-02-21 12:43:00 +01:00
..
audio Merge remote-tracking branch 'upstream/master' into stdenv-updates 2013-02-17 08:19:40 -05:00
display-managers/slim consolekit: Remove 2012-12-13 11:30:18 +01:00
editors Merge branch 'upstream-master' into stdenv-updates 2013-02-19 10:09:39 -05:00
graphics Merge branch stdenv-updates into x-updates 2013-02-21 12:43:00 +01:00
misc Merge branch stdenv-updates into x-updates 2013-02-21 12:43:00 +01:00
networking Merge branch 'upstream-master' into stdenv-updates 2013-02-19 10:09:39 -05:00
office Merge branch stdenv-updates into x-updates 2013-02-21 12:43:00 +01:00
science Merge branch stdenv-updates into x-updates 2013-02-21 12:43:00 +01:00
taxes * It's that time of year again. 2012-03-10 19:23:04 +00:00
version-management Merge branch stdenv-updates into x-updates 2013-02-21 12:43:00 +01:00
video add nasm to xbmc dependencies 2013-02-16 23:23:15 +01:00
virtualization Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
window-managers xmonad: install man page into the proper location 2013-02-11 23:26:06 +01:00