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
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
lib
misc
os-specific	Linux-3.9-rc2	2013-03-16 16:27:19 +04:00
servers
shells
stdenv
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