Frederik Rietdijk 4e22e88b91 Merge remote-tracking branch 'upstream/master' into HEAD		2017-09-28 10:51:26 +02:00
..
applications	octoprint-plugins.m33-fio: 1.20 -> 1.21	2017-09-28 03:33:23 +03:00
build-support	Merge branch 'master' into staging	2017-09-26 22:31:59 +02:00
common-updater
data	Merge pull request #29787 from siddharthist/tex-gyre-termes-math	2017-09-26 07:25:24 +01:00
desktops	lxqt.screengrab: 2017-02-18 -> 1.97 (#29835)	2017-09-28 00:52:18 +02:00
development	python.pkgs.twine: 1.8.1 -> 1.9.1	2017-09-28 10:21:48 +02:00
games	Merge pull request #29689 from jerith666/minecraft-1.12.2	2017-09-24 07:46:57 +00:00
misc	snes9x-gtk: 1.53 -> 1.54.1	2017-09-28 00:59:08 +02:00
os-specific	nvidia-x11: 384.69 -> 384.90	2017-09-28 00:01:37 -07:00
servers	elasticsearch: use jre_headless	2017-09-28 04:16:54 +02:00
shells	oh-my-zsh: 2017-06-22 -> 2017-09-24	2017-09-26 08:59:08 -04:00
stdenv	cc-wrapper: Use stdenvNoCC to build	2017-09-26 14:08:21 -04:00
test	treewide: Use *Platform.extensions	2017-09-13 11:16:10 -04:00
tools	hdf5: remove references to stdenv.cc	2017-09-28 10:41:38 +02:00
top-level	Merge remote-tracking branch 'upstream/master' into HEAD	2017-09-28 10:51:26 +02:00