Matthew Pickering 8a4661588a Fixes for rebase		2018-08-12 22:13:00 +01:00
..
applications	Fixes for rebase	2018-08-12 22:13:00 +01:00
build-support	Merge pull request #44870 from symphorien/tests-eval	2018-08-10 19:06:20 +02:00
common-updater
data	Merge branch 'master' into add-missing-licenses	2018-08-09 13:10:27 +02:00
desktops	Small fixes	2018-08-12 10:36:43 +01:00
development	vigra: Build on darwin	2018-08-11 22:36:48 +01:00
games	Merge pull request #44882 from nonfreeblob/crawl-0.22.0	2018-08-11 18:22:49 +02:00
misc	Merge branch 'master' into add-missing-licenses	2018-08-11 09:36:34 +02:00
os-specific	Merge branch 'master' into add-missing-licenses	2018-08-11 09:36:34 +02:00
servers	Merge branch 'master' into add-missing-licenses	2018-08-11 09:36:34 +02:00
shells	antibody: 3.5.1 -> 3.6.1 (#44481)	2018-08-05 21:00:55 +02:00
stdenv
test
tools	Merge pull request #44894 from markuskowa/sqlite-lic	2018-08-11 15:31:29 +02:00
top-level	Remove duplicated attribute	2018-08-11 23:08:17 +01:00