Jan Tojnar d3259ed673 Merge branch 'master' into staging		2019-04-20 12:49:01 +02:00
..
applications	Merge branch 'master' into staging	2019-04-20 12:49:01 +02:00
build-support	trivial-builders: Fix runCommand examples	2019-04-19 06:29:42 +02:00
common-updater	update-source-version: Fixes, add --ignore-same-hash	2019-04-06 19:47:08 -04:00
data	fix evaluation with config.allowAliases = false	2019-04-19 10:16:44 +00:00
desktops	Merge branch 'master' into staging	2019-04-20 12:49:01 +02:00
development	Merge branch 'master' into staging	2019-04-20 12:49:01 +02:00
games	Merge pull request #59902 from bjpbakker/update-factorio	2019-04-20 08:27:31 +00:00
misc	fix evaluation with config.allowAliases = false (#59879)	2019-04-19 15:14:03 +02:00
os-specific	Merge branch 'master' into staging	2019-04-20 12:49:01 +02:00
servers	Merge pull request #59852 from Izorkin/memcached	2019-04-19 17:41:40 +02:00
shells	oh-my-zsh: 2019-04-04 -> 2019-04-18	2019-04-19 08:11:49 -04:00
stdenv	Merge pull request #59338 from matthewbauer/llvm-libc++	2019-04-12 14:09:00 -04:00
test
tools	Merge branch 'master' into staging	2019-04-20 12:49:01 +02:00
top-level	Merge branch 'master' into staging	2019-04-20 12:49:01 +02:00