Vladimír Čunát ded9a4b1aa Merge branch 'staging-next' into staging ... Commits from master, conflict resolutions, etc.		2018-08-13 20:57:50 +02:00
..
applications	Merge branch 'staging-next' into staging	2018-08-13 20:57:50 +02:00
build-support	Merge branch 'staging-next' into staging	2018-08-13 20:57:50 +02:00
common-updater
data	Merge branch 'master' into staging-next	2018-08-13 20:43:59 +02:00
desktops	Merge branch 'staging-next' into staging	2018-08-13 20:57:50 +02:00
development	Merge branch 'staging-next' into staging	2018-08-13 20:57:50 +02:00
games	Merge branch 'master' into staging-next	2018-08-13 20:43:59 +02:00
misc	Merge branch 'staging-next' into staging	2018-08-13 20:57:50 +02:00
os-specific	Merge branch 'staging-next' into staging	2018-08-13 20:57:50 +02:00
servers	Merge branch 'staging-next' into staging	2018-08-13 20:57:50 +02:00
shells	Merge branch 'staging-next' into staging	2018-08-13 20:57:50 +02:00
stdenv	Revert "cc-wrapper, bintools-wrapper: simply symlink man and info outputs"	2018-08-09 12:57:38 +02:00
test	pkgs/tests: Add test for LD_LIBRARY_PATH	2018-08-01 19:02:21 +03:00
tools	Merge branch 'staging-next' into staging	2018-08-13 20:57:50 +02:00
top-level	Merge branch 'staging-next' into staging	2018-08-13 20:57:50 +02:00