Yury G. Kudryashov 9ee0a9df9b svn merge ^/nixpkgs/trunk ... A few trivial conflicts svn path=/nixpkgs/branches/stdenv-updates/; revision=31434		2012-01-08 16:01:12 +00:00
..
applications	svn merge ^/nixpkgs/trunk	2012-01-08 16:01:12 +00:00
build-support	svn merge ^/nixpkgs/trunk	2012-01-04 09:54:17 +00:00
data	Add cantarell-fonts, part of GNOME-3	2012-01-06 20:10:23 +00:00
desktops	State qt version (3/4) in packages, not in all-packages.nix	2012-01-07 17:06:49 +00:00
development	svn merge ^/nixpkgs/trunk	2012-01-08 16:01:12 +00:00
games	svn merge ^/nixpkgs/trunk	2012-01-08 16:01:12 +00:00
lib	svn merge ^/nixpkgs/trunk	2012-01-04 15:22:16 +00:00
misc	svn merge ^/nixpkgs/trunk	2012-01-08 16:01:12 +00:00
os-specific	svn merge ^/nixpkgs/trunk	2012-01-08 16:01:12 +00:00
servers
shells
stdenv
test
tools	svn merge ^/nixpkgs/trunk	2012-01-08 16:01:12 +00:00
top-level	svn merge ^/nixpkgs/trunk	2012-01-08 16:01:12 +00:00