John Ericson a18053bdfe Merge remote-tracking branch 'upstream/master' into staging		2018-01-18 14:17:58 -05:00
..
applications	Merge remote-tracking branch 'upstream/master' into staging	2018-01-18 14:17:58 -05:00
build-support	Merge pull request #34018 from obsidiansystems/fetchpatch	2018-01-18 12:39:39 -05:00
common-updater	update-source-version: Name part of name can contain dashes	2017-12-26 20:02:01 +02:00
data	hackage: update all-cabal-hashes snapshot to Hackage at 2018-01-18T14:32:45Z	2018-01-18 17:01:33 +01:00
desktops	Merge commit '2e56ba' from staging into master	2018-01-17 12:50:46 +02:00
development	Merge remote-tracking branch 'upstream/master' into staging	2018-01-18 14:17:58 -05:00
games	Merge pull request #33824 from peterhoeg/u/physfs	2018-01-18 15:36:30 +00:00
misc	elk: 5.6.5 -> 5.6.6	2018-01-17 02:11:19 +01:00
os-specific	Merge remote-tracking branch 'upstream/master' into staging	2018-01-18 14:17:58 -05:00
servers	Merge pull request #33967 from yegortimoshenko/20180117.050213/mornfall	2018-01-18 11:27:31 +01:00
shells	Remove nckx as a maintainer for all packages	2018-01-16 23:00:49 +01:00
stdenv	Merge branch 'ericson2314-cross-master' into staging	2018-01-16 13:05:39 -05:00
test	sierra-shared-test: fix build	2018-01-05 23:20:55 +01:00
tools	netcat-openbsd: 1.130 -> 1.187	2018-01-18 12:01:05 +00:00
top-level	multi-ghc-travis: update to latest Git version and create a proper Haskell build	2018-01-18 17:01:33 +01:00