Frederik Rietdijk 6467cd4336 Merge pull request #43921 from r-ryantm/auto-update/opencollada ... opencollada: 1.6.62 -> 1.6.63		2018-07-22 08:58:12 +02:00
..
applications	Merge pull request #43899 from r-ryantm/auto-update/tla-toolbox	2018-07-22 08:44:58 +02:00
build-support	Merge branch 'master' into unused5	2018-07-21 15:41:22 +01:00
common-updater
data	Merge pull request #43890 from matthewbauer/mingw-fixes	2018-07-21 17:04:20 -04:00
desktops	treewide: fix build with disallowed aliases (#43872)	2018-07-21 22:03:24 -04:00
development	Merge pull request #43921 from r-ryantm/auto-update/opencollada	2018-07-22 08:58:12 +02:00
games	Merge pull request #43946 from r-ryantm/auto-update/cutemaze	2018-07-22 08:22:04 +02:00
misc	Merge branch 'master' into unused5	2018-07-21 15:41:22 +01:00
os-specific	Merge pull request #43949 from r-ryantm/auto-update/acpid	2018-07-22 08:21:03 +02:00
servers	treewide: fix build with disallowed aliases (#43872)	2018-07-21 22:03:24 -04:00
shells	Merge pull request #43912 from r-ryantm/auto-update/powershell	2018-07-22 08:44:38 +02:00
stdenv	[bot] treewide: remove unused 'inherit' in let blocks	2018-07-20 19:38:19 +00:00
test	tests: add some cross tests	2018-07-21 17:00:05 -04:00
tools	Merge pull request #43918 from r-ryantm/auto-update/pass-import	2018-07-22 08:41:46 +02:00
top-level	Revert "Revert "release: disallow aliases""	2018-07-21 22:08:53 -04:00