Vladimír Čunát b1eeae8cac Merge branch 'master' into x-updates ... Conflicts (easy): pkgs/desktops/xfce/core/xfdesktop.nix pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/pango/default.nix		2013-03-17 11:28:28 +01:00
..
applications	Merge branch 'master' into x-updates	2013-03-17 11:28:28 +01:00
build-support	Debian VM image: Update to 6.0.7	2013-03-15 12:48:35 +01:00
data	Merge branch 'master' into x-updates	2013-03-09 17:55:37 +01:00
desktops	Merge branch 'master' into x-updates	2013-03-17 11:28:28 +01:00
development	Merge branch 'master' into x-updates	2013-03-17 11:28:28 +01:00
games	vdrift: update and fix	2013-03-09 14:59:39 +01:00
lib	Merge branch 'master' into x-updates	2013-03-09 17:55:37 +01:00
misc	Merge branch 'master' into x-updates	2013-03-09 17:55:37 +01:00
os-specific	Linux-3.9-rc2	2013-03-16 16:27:19 +04:00
servers	Merge branch 'fixVmwareFix' of git://github.com/Davorak/nixpkgs	2013-03-08 18:19:02 -05:00
shells
stdenv	Enable __ignoreNulls globally	2013-03-07 19:42:01 +01:00
test
tools	runLaTeX: Fix dependency detection	2013-03-16 16:56:19 +01:00
top-level	Merge branch 'master' into x-updates	2013-03-17 11:28:28 +01:00