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
..
clang-purity.patch
clang-tablegen-dir.patch
clang.nix
default.nix
dragonegg.nix	dragonegg: fix build via update to 3.3	2013-12-11 12:14:01 +01:00
more-memory-for-bugpoint.patch