Files
nixpkgs/pkgs/applications
Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
..
2014-03-01 16:54:16 +01:00
2014-08-03 22:29:40 +04:00