Peter Simons cc679b8383 Merge pull request #11040 from cleverca22/master ... future proof the wireshark source path		2015-11-16 11:03:51 +01:00
..
applications	Merge pull request #11040 from cleverca22/master	2015-11-16 11:03:51 +01:00
build-support	Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""	2015-11-14 12:32:51 -08:00
data	Merge branch 'master.upstream' into staging.upstream	2015-11-05 10:07:28 -08:00
desktops	Merge commit 'cb21b77' into master.upstream	2015-11-13 15:53:10 -08:00
development	kcov : init at 29	2015-11-15 18:07:48 +01:00
games	macopix: init at 1.7.4	2015-11-12 20:54:48 +00:00
misc	xscreensaver: security update 5.33 -> 5.34 (close #10845)	2015-11-16 08:20:12 +01:00
os-specific	syslinux: 6.03 -> 2015-11-09	2015-11-14 12:38:56 -08:00
servers	Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""	2015-11-14 12:32:51 -08:00
shells	fish: fix use hostname from the store instead of from the environment	2015-11-06 09:55:55 +01:00
stdenv	Don't fail if env-vars cannot be written to	2015-11-04 16:32:59 +01:00
test
tools	Merge pull request #11032 from zimbatm/ttyrec-1.0.8	2015-11-15 16:25:14 +03:00
top-level	Merge pull request #11037 from FlorentBecker/kcov	2015-11-15 19:54:54 +01:00