nixpkgs/pkgs
Peter Simons 6be8ad3392 Merge branch 'origin/master' into stdenv-updates.
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
2013-10-18 18:57:24 +02:00
..
applications Merge branch 'origin/master' into stdenv-updates. 2013-10-18 18:57:24 +02:00
build-support Merge branch 'origin/master' into stdenv-updates. 2013-10-18 18:57:24 +02:00
data tzdata: Update to 2013g 2013-10-15 17:24:33 +02:00
desktops
development Merge branch 'origin/master' into stdenv-updates. 2013-10-18 18:57:24 +02:00
games Merge branch 'origin/master' into stdenv-updates. 2013-10-18 18:57:24 +02:00
misc Merge branch 'origin/master' into stdenv-updates. 2013-10-18 18:57:24 +02:00
os-specific linux: Update to 3.4.66 2013-10-14 12:52:22 +02:00
servers Merge branch 'origin/master' into stdenv-updates. 2013-10-18 18:57:24 +02:00
shells
stdenv Merge branch 'origin/master' into stdenv-updates. 2013-10-18 18:57:24 +02:00
test
tools Merge branch 'origin/master' into stdenv-updates. 2013-10-18 18:57:24 +02:00
top-level Merge branch 'origin/master' into stdenv-updates. 2013-10-18 18:57:24 +02:00