Tuomas Tynkkynen 34f95d92a2 Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/applications/misc/pytrainer/default.nix pkgs/development/tools/pew/default.nix pkgs/tools/misc/you-get/default.nix		2018-02-28 20:52:49 +02:00
..
applications	Merge remote-tracking branch 'upstream/master' into staging	2018-02-28 20:52:49 +02:00
build-support	Merge remote-tracking branch 'upstream/master' into staging	2018-02-28 20:52:49 +02:00
common-updater	update-source-version: Fix regex metacharacter	2018-02-17 22:34:12 +02:00
data	Merge remote-tracking branch 'upstream/master' into staging	2018-02-28 20:52:49 +02:00
desktops	tree-wide: autorename gnome packages to use dashes	2018-02-25 17:41:16 +01:00
development	Merge remote-tracking branch 'upstream/master' into staging	2018-02-28 20:52:49 +02:00
games	tintin: 2.01.1 -> 2.01.4	2018-02-28 14:17:27 +00:00
misc	Merge remote-tracking branch 'upstream/master' into staging	2018-02-28 20:52:49 +02:00
os-specific	Merge remote-tracking branch 'upstream/master' into staging	2018-02-28 20:52:49 +02:00
servers	Merge remote-tracking branch 'upstream/master' into staging	2018-02-28 20:52:49 +02:00
shells	Merge remote-tracking branch 'upstream/master' into staging	2018-02-28 20:52:49 +02:00
stdenv	Merge remote-tracking branch 'upstream/master' into staging	2018-02-28 20:52:49 +02:00
test	tree-wide: autorename gnome packages to use dashes	2018-02-25 17:41:16 +01:00
tools	Merge remote-tracking branch 'upstream/master' into staging	2018-02-28 20:52:49 +02:00
top-level	Merge remote-tracking branch 'upstream/master' into staging	2018-02-28 20:52:49 +02:00