Files
nixpkgs/pkgs/shells
Tuomas Tynkkynen aadaa91379 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
2016-05-03 23:12:48 +03:00
..
2016-04-25 17:12:49 +02:00
2016-04-25 09:13:06 -07:00
2016-03-08 18:07:00 +01:00
2015-11-25 23:06:09 +01:00
2016-03-31 16:57:30 +02:00