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
..
core	Merge master into x-updates	2013-12-18 23:21:29 +01:00
desktop	add introspection into GTK libs (part of #517)	2013-08-04 21:11:24 +02:00
default.nix	Merge branch 'master' into x-updates	2013-12-07 14:17:16 +01:00