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
..
bindings
desktop	gnome.gvfs: update from 1.14.1 to 1.14.2	2013-12-11 09:47:45 +02:00
platform	Merge master into x-updates	2013-12-18 23:21:29 +01:00
default.nix