Peter Simons 18916022e4 haskell-hspec: update overrides for LTS 4.2		2016-01-20 14:33:37 +01:00
..
applications	Merge pull request #12206 from mayflower/mopidy/https	2016-01-20 13:08:57 +01:00
build-support	Merge pull request #10998 from andrewrynhard/master	2016-01-19 12:01:55 +01:00
data	geolite-legacy 2016-01-11 -> 2016-01-18	2016-01-18 15:22:40 +01:00
desktops	gnome3: 3.18.1 -> 3.18.2	2016-01-19 11:32:06 +01:00
development	haskell-hspec: update overrides for LTS 4.2	2016-01-20 14:33:37 +01:00
games	zeroad: fix 0ad.desktop after #12421	2016-01-20 11:28:13 +01:00
misc	vimPlugins.youcompleteme: enable on unix	2016-01-19 22:41:31 +01:00
os-specific	linux: patch CVE-2016-0728 (close #12492)	2016-01-20 09:31:53 +01:00
servers	Merge branch 'master' into staging	2016-01-18 09:48:49 +01:00
shells	fish: fix merge conflict	2016-01-05 23:32:29 +01:00
stdenv	Merge branch 'master' into staging	2016-01-18 09:48:49 +01:00
test
tools	snapper: various tweaks and fixes	2016-01-20 09:21:44 +01:00
top-level	Add LTS Haskell 4.2.	2016-01-20 14:33:37 +01:00