Vladimír Čunát 6899c7fdb9 Merge branch 'master' into gcc-6		2017-08-12 10:09:41 +02:00
..
applications	Merge branch 'master' into gcc-6	2017-08-12 10:09:41 +02:00
build-support	Merge branch 'master' into gcc-6	2017-08-12 10:09:41 +02:00
common-updater
data	tests.plasma5: fix eval	2017-08-11 21:53:17 +02:00
desktops	Merge branch 'master' into gcc-6	2017-08-12 10:09:41 +02:00
development	Merge branch 'master' into gcc-6	2017-08-12 10:09:41 +02:00
games	Merge branch 'master' into gcc-6	2017-08-12 10:09:41 +02:00
misc	mergeAttrsByVersion, versionedDerivation: remove	2017-08-11 23:31:02 +02:00
os-specific	Merge older staging	2017-08-12 09:48:17 +02:00
servers	Merge pull request #28068 from Infinisil/mpd-lame	2017-08-11 15:52:31 +00:00
shells	oil: init at 0.0.0	2017-08-06 18:17:00 +01:00
stdenv	stdenv: fix typo in setup.sh	2017-08-09 17:33:02 +01:00
test	macos-sierra-shared: Make live code and add to nascent Darwin channel	2017-07-31 21:28:18 -04:00
tools	Merge branch 'master' into gcc-6	2017-08-12 10:09:41 +02:00
top-level	Merge branch 'master' into gcc-6	2017-08-12 10:09:41 +02:00