Vladimír Čunát cb639302df Merge glibc-2.18 branch into stdenv-updates ... It's to separate from other changes coming from master. Conflicts: pkgs/development/libraries/glibc/2.18/common.nix (taking both changes) pkgs/development/libraries/ncurses/5_4.nix (deleted)		2013-12-28 18:51:23 +01:00
..
applications	Merge glibc-2.18 branch into stdenv-updates	2013-12-28 18:51:23 +01:00
build-support	pkgs/build-support/cabal: add 'buildTarget' attribute to allow passing flags to "./Setup build"	2013-12-16 21:21:31 +01:00
data	shared_mime_info: update from 1.1 to 1.2	2013-12-04 06:53:44 +02:00
desktops	gnome.gvfs: update from 1.14.1 to 1.14.2	2013-12-11 09:47:45 +02:00
development	Merge glibc-2.18 branch into stdenv-updates	2013-12-28 18:51:23 +01:00
games	Merge branch 'origin/master' into stdenv-updates.	2013-12-16 21:13:24 +01:00
misc	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-12-10 00:25:54 +01:00
os-specific	Updating nvidia legacy 304 to 304.117	2013-12-18 11:24:53 +01:00
servers	Merge branch 'origin/master' into stdenv-updates.	2013-12-16 21:13:24 +01:00
shells	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-12-04 18:33:52 +01:00
stdenv	stdenv/setup.sh: fix previous change...	2013-12-28 10:43:34 +01:00
test
tools	Merge glibc-2.18 branch into stdenv-updates	2013-12-28 18:51:23 +01:00
top-level	Merge glibc-2.18 branch into stdenv-updates	2013-12-28 18:51:23 +01:00