Vladimír Čunát 4c5a71f777 Merge master into x-updates ... Conflicts: pkgs/desktops/gnome-2/desktop/gvfs/default.nix pkgs/development/libraries/cogl/default.nix pkgs/development/libraries/libsoup/2.44.nix		2013-12-18 23:21:29 +01:00
..
default.nix	Fix Nixpkgs evaluation	2012-07-18 11:16:02 -04:00
graphite2.nix	Merge master into x-updates	2013-12-18 23:21:29 +01:00