Frederik Rietdijk 43520486c7 Merge pull request #42345 from Ma27/fix-python-git-annex-adapter ... python3Packages.git-annex-adapter: fix build		2018-06-23 18:04:39 +02:00
..
applications	octoprint: fix build	2018-06-23 13:45:09 +02:00
build-support	singularity-tools: create mount points for image building (#41470)	2018-06-18 23:50:06 +02:00
common-updater
data	all-cabal-hashes: update snapshot to Hackage at 2018-06-14T18:11:23Z	2018-06-16 15:57:43 +02:00
desktops	Merge pull request #42229 from r-ryantm/auto-update/marco	2018-06-21 09:17:33 +01:00
development	Merge pull request #42345 from Ma27/fix-python-git-annex-adapter	2018-06-23 18:04:39 +02:00
games	wesnoth: 1.14.2 -> 1.14.3 (#42195)	2018-06-19 23:24:05 +00:00
misc	dolphinEmuMaster: 20180618 -> 2018-06-22	2018-06-23 01:48:52 -07:00
os-specific	Merge staging into master	2018-06-22 13:20:37 +02:00
servers	Merge staging into master	2018-06-23 08:23:24 +02:00
shells	Merge branch 'master' into staging	2018-06-20 18:17:18 +02:00
stdenv	Merge staging into master	2018-06-23 08:23:24 +02:00
test	Merge remote-tracking branch 'upstream/master' into staging	2018-06-18 15:30:39 -04:00
tools	Merge pull request #41762 from tilpner/appimage-run	2018-06-23 07:23:08 -05:00
top-level	Merge pull request #41762 from tilpner/appimage-run	2018-06-23 07:23:08 -05:00