Frederik Rietdijk 58f0dcfeb1 Merge pull request #20365 from hakuch/fix_opam ... clingo, gringo: Revert opam solver dependency changes		2016-11-18 18:49:07 +01:00
..
applications	Merge pull request #20532 from gnidorah/master2	2016-11-18 18:03:54 +01:00
build-support	fetchFromGitHub: add fetchSubmodules option	2016-11-18 13:04:26 +02:00
data	pecita: 5.3 -> 5.4	2016-11-17 00:06:41 +01:00
desktops	Merge pull request #20433 from ttuegel/install-cd-kde-5	2016-11-18 11:29:47 -06:00
development	Add haskell packages set for cross ghc	2016-11-18 10:44:53 -05:00
games	supertux: 0.5.0 -> 0.5.1	2016-11-17 16:52:33 -02:00
misc	Merge pull request #20519 from avnik/wine-update	2016-11-18 11:22:19 +00:00
os-specific	Add haskell packages set for cross ghc	2016-11-18 10:44:53 -05:00
servers	plex: 1.0.0 -> 1.2.7; fix some more binaries (#20137)	2016-11-17 18:16:20 -06:00
shells	rush: 1.7 -> 1.8 (#20424)	2016-11-15 13:33:56 +00:00
stdenv	allowUnfree: mention the solution that works for nix-shell as well	2016-11-16 15:14:19 +01:00
test
tools	Merge pull request #20365 from hakuch/fix_opam	2016-11-18 18:49:07 +01:00
top-level	Merge pull request #20365 from hakuch/fix_opam	2016-11-18 18:49:07 +01:00