Tuomas Tynkkynen 2fec9c6e29 Merge remote-tracking branch 'upstream/master' into staging ...

Conflicts:
	pkgs/development/tools/build-managers/conan/default.nix

2018-03-13 23:04:18 +02:00

..

altcoins

altcoins.bitcoin-unlimited: 1.0.2.0 - > 1.0.3.0 (#36715)

2018-03-13 13:57:58 +00:00

audio

Merge pull request #36830 from symphorien/ssr

2018-03-13 00:23:20 +00:00

backup

tree-wide: autorename gnome packages to use dashes

2018-02-25 17:41:16 +01:00

display-managers

Merge remote-tracking branch 'upstream/master' into HEAD

2018-02-27 16:22:37 +01:00

editors

android-studio: fix GTK LaF

2018-03-13 16:13:18 +03:00

gis

qgis: 2.18.15 -> 2.18.16

2018-02-28 14:22:48 +00:00

graphics

treewide: s/xlibs/xorg/g (#36889)

2018-03-13 10:16:03 +00:00

inferno

…

kde

okular: exclude chmlib on ARM

2018-03-07 09:57:34 +08:00

misc

Merge remote-tracking branch 'upstream/master' into staging

2018-03-13 23:04:18 +02:00

networking

Merge pull request #36673 from averelld/upgrade-teamviewer

2018-03-13 18:42:37 +00:00

office

treewide: s/xlibs/xorg/g (#36889)

2018-03-13 10:16:03 +00:00

science

Merge remote-tracking branch 'upstream/master' into staging

2018-03-13 23:04:18 +02:00

search

recoll: Avoid using substituteInPlace on zip files

2018-02-28 17:44:42 -08:00

taxes

…

version-management

Merge remote-tracking branch 'upstream/master' into staging

2018-03-13 23:04:18 +02:00

video

avidemux: restrict platforms

2018-03-06 13:58:14 +03:00

virtualization

runc: 1.0.0rc4 -> 1.0.0rc5

2018-03-11 15:42:36 -05:00

window-managers

Merge pull request #36888 from volth/xfce-naming

2018-03-13 18:44:59 +00:00