Tuomas Tynkkynen 067d1cf330 Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/applications/science/math/sage/sage-src.nix		2018-10-27 19:58:03 +03:00
..
altcoins	altcoins.litecoin: 0.16.2 -> 0.16.3 (#49247)	2018-10-27 09:15:24 -04:00
audio	Merge pull request #49179 from r-ryantm/auto-update/pulseeffects	2018-10-26 22:21:44 +02:00
backup	Revert "treewide: remove placeholder usage"	2018-08-30 18:18:29 +02:00
display-managers	sddm: 0.17.0 -> 0.18.0	2018-10-26 12:17:58 +02:00
editors	vim: 8.1.0450 -> 8.1.0490	2018-10-26 23:31:16 +02:00
gis	openorienteering-mapper: 0.8.2 -> 0.8.3 (#49217)	2018-10-27 12:03:09 -04:00
graphics	batik: mark as insecure	2018-10-26 12:17:58 +02:00
inferno
kde	marble: Fix include install to dev output	2018-10-20 14:17:22 -08:00
misc	Merge pull request #49216 from r-ryantm/auto-update/nnn	2018-10-27 14:49:42 +02:00
networking	Merge pull request #49242 from cleverca22/wireshark-add-headers	2018-10-27 08:39:51 -03:00
office	mytetra: support opening urls under wayland (#48641)	2018-10-24 11:08:06 +02:00
science	Merge remote-tracking branch 'upstream/master' into staging	2018-10-27 19:58:03 +03:00
search	catfish: 1.4.4 -> 1.4.6 (#45860)	2018-08-31 16:11:38 +02:00
version-management	gitlab: 11.3.4 -> 11.4.0	2018-10-26 11:32:28 +02:00
video	mapmap: mark broken	2018-10-25 17:53:58 +02:00
virtualization	containerd: 1.1.4 -> 1.2.0	2018-10-25 15:28:17 +02:00
window-managers	sway-beta: init at 1.0-beta1 (#48829)	2018-10-23 20:34:59 +02:00