Tuomas Tynkkynen aba0b45b86 Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/development/libraries/qt-5/5.7/qtbase/default.nix		2017-03-14 00:49:22 +02:00
..
darwin	khd: 2.0.0 -> 2.1.1	2017-03-04 19:38:31 +01:00
gnu	top-level: crossSystem is no longer exposed to packages. Use *Platform.	2017-01-24 11:37:56 -05:00
linux	Merge remote-tracking branch 'upstream/master' into staging	2017-03-14 00:49:22 +02:00
windows	mingw: update 3.1.0 -> 4.0.6	2016-04-21 13:38:20 +02:00