nixpkgs/pkgs/os-specific
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
..
darwin Merge pull request #14706 from acowley/frameworks-GL 2016-04-24 22:38:47 +03:00
gnu samba: Revert style changes and get rid of some dependencies 2015-06-01 15:35:59 +02:00
linux Merge remote-tracking branch 'upstream/master' into staging 2016-05-03 23:12:48 +03:00
windows jom: move to qmake4Hook 2016-04-20 18:55:55 +03:00