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
..
altcoins
audio	padthv1: 0.8.5 -> 0.8.6	2018-02-28 14:28:01 +00:00
backup
display-managers	Merge remote-tracking branch 'upstream/master' into HEAD	2018-02-27 16:22:37 +01:00
editors	vis: 0.3 -> 0.4	2018-02-28 12:17:02 +01:00
gis	qgis: 2.18.15 -> 2.18.16	2018-02-28 14:22:48 +00:00
graphics	Merge pull request #35751 from ryantm/auto-update/leocad-17.07-to-18.02	2018-02-27 21:52:41 +08:00
inferno
kde
misc	Merge remote-tracking branch 'upstream/master' into staging	2018-02-28 20:52:49 +02:00
networking	Merge pull request #36124 from leenaars/tribler701	2018-02-28 15:07:17 +00:00
office	tudu: 0.10 -> 0.10.2	2018-02-28 11:46:59 +01:00
science	Merge remote-tracking branch 'upstream/master' into staging	2018-02-28 20:52:49 +02:00
search	recoll: 1.23.5 -> 1.23.7	2018-02-28 14:21:35 +00:00
taxes
version-management	Merge remote-tracking branch 'upstream/master' into staging	2018-02-28 20:52:49 +02:00
video	peek: 1.2.0 -> 1.2.2	2018-02-28 14:25:21 +00:00
virtualization	docker: 17.12.0 -> 17.12.1	2018-02-28 12:48:17 -05:00
window-managers	pythonPackages.cairocffi: move out of python-modules.nix	2018-02-27 19:29:56 +01:00