Peter Simons 76244ac2e2 Merge branch 'master' into stdenv-updates ... Conflicts: pkgs/development/compilers/ghc/with-packages.nix		2013-08-16 22:51:13 +02:00
..
applications	Merge branch 'master' into stdenv-updates	2013-08-16 22:51:13 +02:00
build-support	Merge branch 'master' into stdenv-updates	2013-08-16 22:51:13 +02:00
data	tango-icon-theme: Add	2013-08-15 18:01:16 +02:00
desktops	add thunar-archive-plugin	2013-08-16 13:57:08 +02:00
development	Merge branch 'master' into stdenv-updates	2013-08-16 22:51:13 +02:00
games	Merge branch 'master' into stdenv-updates	2013-08-16 22:51:13 +02:00
lib
misc
os-specific	linux: Update to 3.4.58	2013-08-16 12:05:42 +02:00
servers	Merge branch 'master' into stdenv-updates	2013-08-16 22:51:13 +02:00
shells
stdenv
test
tools	Merge branch 'master' into stdenv-updates	2013-08-16 22:51:13 +02:00
top-level	Merge branch 'master' into stdenv-updates	2013-08-16 22:51:13 +02:00