adisbladis 7c256d0011 Merge pull request #32057 from andir/ipv6calc-gcc-7 ... ipv6calc: 0.99.2 -> 1.0.0 (also fixes gcc-7 compilation)		2017-11-26 12:16:42 +08:00
..
applications	Merge pull request #32046 from rbasso/exercism-2.4.1	2017-11-26 12:08:47 +08:00
build-support	Merge branch 'staging' (older one)	2017-11-24 18:36:54 +01:00
common-updater
data	Merge remote-tracking branch 'upstream/master' into HEAD	2017-11-25 09:13:36 +01:00
desktops	Merge remote-tracking branch 'upstream/master' into HEAD	2017-11-25 09:13:36 +01:00
development	python.pkgs.bokeh: add myself to maintainers	2017-11-25 22:35:14 +00:00
games	Merge pull request #31994 from kierdavis/freesweep	2017-11-25 14:51:29 +00:00
misc	Merge pull request #31184 from AndersonTorres/upload/openmsx	2017-11-25 15:55:27 +00:00
os-specific	conky: fix compilation with gcc-7	2017-11-25 15:57:40 +01:00
servers	Merge pull request #31694 from Mic92/openafs	2017-11-25 16:04:26 +00:00
shells	nix-bash-completions: 0.4 -> 0.5	2017-11-21 14:05:03 +01:00
stdenv	Merge pull request #31775 from obsidiansystems/stdenv-both-propagated-files	2017-11-22 15:23:37 -05:00
test	treewide: Use *Platform.extensions	2017-09-13 11:16:10 -04:00
tools	ipv6calc: 0.99.2 -> 1.0.0 (also fixes gcc-7 compilation)	2017-11-26 01:41:30 +01:00
top-level	python3Packages.bash_kernel: init at 0.7.1	2017-11-25 19:10:43 +00:00