Michael Raskin 19530856ed Merge remote-tracking branch 'upstream/master' into x-updates ... Conflicts: pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/gdk-pixbuf/default.nix pkgs/development/libraries/gtk+/2.x.nix pkgs/misc/ghostscript/default.nix pkgs/top-level/all-packages.nix		2013-06-13 17:12:43 +04:00
..
applications	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-13 17:12:43 +04:00
build-support
data	Merge remote-tracking branch 'hydra/master' into x-updates	2013-06-08 15:41:39 +00:00
desktops	kde410.kdepimlibs: add pkgconfig	2013-06-13 13:02:24 +02:00
development	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-13 17:12:43 +04:00
games
lib	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-13 17:12:43 +04:00
misc	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-13 17:12:43 +04:00
os-specific	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-13 17:12:43 +04:00
servers	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-13 17:12:43 +04:00
shells	fish: Add fish 2.0.0	2013-06-04 10:20:30 +01:00
stdenv
test
tools	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-13 17:12:43 +04:00
top-level	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-13 17:12:43 +04:00