1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 05:31:22 +00:00
nixpkgs/pkgs
Mathijs Kwik 609f8dc04b Merge branch 'master' into stdenv-updates
Conflicts:
	pkgs/top-level/all-packages.nix
2013-11-01 08:31:54 +01:00
..
applications Merge branch 'master' into stdenv-updates 2013-11-01 08:31:54 +01:00
build-support Merge branch 'master' into stdenv-updates 2013-11-01 08:31:54 +01:00
data man-pages: Update to 3.54 2013-10-23 10:36:21 +02:00
desktops Remove obsolete xfceutils attribute 2013-10-30 15:35:09 +01:00
development Merge branch 'master' into stdenv-updates 2013-11-01 08:31:54 +01:00
games Merge branch 'master' into stdenv-updates 2013-11-01 08:31:54 +01:00
misc Merge branch 'master' into stdenv-updates 2013-11-01 08:31:54 +01:00
os-specific grsecurity: Update to 2.9.1-3.2.52-201310271550 2013-10-29 13:32:53 +01:00
servers Merge branch 'master' into stdenv-updates 2013-11-01 08:31:54 +01:00
shells Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-10-02 22:44:12 +02:00
stdenv Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-10-26 18:28:05 +02:00
test
tools Merge branch 'master' into stdenv-updates 2013-11-01 08:31:54 +01:00
top-level Merge branch 'master' into stdenv-updates 2013-11-01 08:31:54 +01:00