Joachim F 63d8458ee0 Merge pull request #45316 from magnetophon/x42-plugins ... x42-plugins: 20180803 > 20180812		2018-08-19 18:15:33 +00:00
..
applications	Merge pull request #45316 from magnetophon/x42-plugins	2018-08-19 18:15:33 +00:00
build-support	Merge branch 'master' into staging-next	2018-08-17 13:45:21 +02:00
common-updater
data	all-cabal-hashes: update snapshot to Hackage at 2018-08-12T09:32:03Z	2018-08-19 13:36:20 +02:00
desktops	Merge branch 'staging-next'	2018-08-17 20:51:31 +02:00
development	Merge pull request #45013 from jbaum98/fflas-ffpack_darwin	2018-08-19 16:24:52 +02:00
games	Merge pull request #44779 from r-ryantm/auto-update/freeciv	2018-08-17 21:46:37 -04:00
misc	Merge pull request #45325 from LnL7/vim-nix	2018-08-19 14:00:28 +01:00
os-specific	Merge pull request #45282 from markuskowa/lics-2	2018-08-19 09:03:31 +01:00
servers	Merge pull request #45319 from Chiiruno/dev/hydron	2018-08-19 18:15:07 +00:00
shells	powershell: 6.0.3 -> 6.0.4	2018-08-13 10:01:53 +07:00
stdenv	Revert "cc-wrapper, bintools-wrapper: simply symlink man and info outputs"	2018-08-09 12:57:38 +02:00
test
tools	Merge pull request #45282 from markuskowa/lics-2	2018-08-19 09:03:31 +01:00
top-level	Merge pull request #45013 from jbaum98/fflas-ffpack_darwin	2018-08-19 16:24:52 +02:00