Files
nixpkgs/pkgs/desktops/gnome-2/platform
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
..
2012-03-08 22:45:02 +00:00
2013-07-04 00:21:46 +10:00
2013-08-16 23:45:01 +02:00
2013-02-21 21:51:09 +01:00
2012-10-09 17:07:59 -04:00
2013-07-03 22:03:47 +10:00