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-12 14:01:48 -05:00
2013-12-18 23:21:29 +01:00
2013-12-18 23:21:29 +01:00
2013-10-10 13:28:22 +02:00
2013-11-01 09:16:36 +01:00
S
Description
No description provided
5 GiB
Languages
Nix 95%
Shell 2%
Python 1.8%
Rust 0.3%
JavaScript 0.2%
Other 0.4%