Frederik Rietdijk 55357de67a Merge remote-tracking branch 'upstream/master' into HEAD		2017-07-28 19:37:36 +02:00
..
applications	Merge branch 'master' into staging	2017-07-28 16:08:30 +02:00
build-support	Merge remote-tracking branch 'upstream/master' into HEAD	2017-07-28 19:37:36 +02:00
common-updater
data	Revert "docbook-xsl: Install dbtoepub"	2017-07-26 11:35:03 +02:00
desktops	stdenv-setup and misc pkgs: Revert to space-deliminated propagated-* files	2017-07-26 09:07:55 -04:00
development	Merge remote-tracking branch 'upstream/master' into HEAD	2017-07-28 19:37:36 +02:00
games	Merge pull request #27687 from elitak/factorio-version	2017-07-28 05:44:28 +01:00
misc	Merge branch 'master' into staging	2017-07-28 16:08:30 +02:00
os-specific	Merge remote-tracking branch 'upstream/master' into HEAD	2017-07-28 19:37:36 +02:00
servers	Merge branch 'master' into staging	2017-07-28 16:08:30 +02:00
shells	bash-completion: 2.5 -> 2.7	2017-07-19 23:58:53 +02:00
stdenv	Merge remote-tracking branch 'upstream/master' into staging-base	2017-07-26 13:46:04 -04:00
test
tools	vulnix: use zc_lockfile, zodbpickle and persistent from pythonPackages	2017-07-28 16:13:28 +02:00
top-level	Merge remote-tracking branch 'upstream/master' into HEAD	2017-07-28 19:37:36 +02:00