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
..
2013-12-18 23:21:29 +01:00
2013-12-16 21:11:29 +01:00
2013-12-18 18:18:37 +02:00
2013-12-18 23:21:29 +01:00
2013-12-18 23:21:29 +01:00
2013-12-18 18:18:28 +02:00
2013-12-18 23:21:29 +01:00
2013-12-18 12:35:07 -05:00
2013-12-18 23:21:29 +01:00
2013-12-18 18:18:24 +02:00
2013-12-18 23:21:29 +01:00
2013-12-18 23:21:29 +01:00