Orivej Desh 881f9b32d1 Merge pull request #31718 from maiksensi/pytest-3.2 ... pytest: 3.2.3 -> 3.2.5		2017-11-17 19:17:39 +00:00
..
applications	Merge branch 'master' into staging	2017-11-17 18:06:22 +00:00
build-support	makeWrapper: delete --set-eval	2017-11-17 12:53:54 +00:00
common-updater
data	Merge pull request #31761 from Ralith/stdman	2017-11-17 01:34:44 +00:00
desktops	Merge pull request #31024 from yegortimoshenko/xfce4-panel/gettext	2017-11-16 20:49:34 +00:00
development	Merge pull request #31718 from maiksensi/pytest-3.2	2017-11-17 19:17:39 +00:00
games	factorio: 0.15.34 -> 0.15.37	2017-11-16 15:48:00 +01:00
misc	makeWrapper: delete --set-eval	2017-11-17 12:53:54 +00:00
os-specific	Merge branch 'master' into staging	2017-11-17 18:06:22 +00:00
servers	Merge branch 'master' into staging	2017-11-17 18:06:22 +00:00
shells	fish-foreign-env: suppress additional harmless warnings	2017-11-14 16:15:58 +07:00
stdenv	Merge branch 'master' into staging	2017-11-17 05:35:09 +00:00
test
tools	Merge branch 'master' into staging	2017-11-17 18:06:22 +00:00
top-level	Merge branch 'master' into staging	2017-11-17 18:06:22 +00:00