Files
nixpkgs/pkgs/development/python-modules
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-11-17 15:10:46 +01:00
2013-07-14 04:17:07 +03:00
2013-01-11 15:23:44 +01:00
2011-07-21 20:14:17 +00:00
2013-07-04 18:16:34 +02:00
2013-10-06 12:01:38 +02:00
2013-07-14 04:17:07 +03:00