Alexander Foremny d987fedd43 Merge remote-tracking branch 'upstream/master' into haskell-snap ... Conflicts: pkgs/development/libraries/haskell/comonad-transformers/default.nix pkgs/development/libraries/haskell/semigroupoids/default.nix pkgs/top-level/haskell-packages.nix		2012-07-26 12:27:59 +02:00
..
applications	Merge remote-tracking branch 'upstream/master' into haskell-snap	2012-07-26 12:27:59 +02:00
build-support
data
desktops
development	Merge remote-tracking branch 'upstream/master' into haskell-snap	2012-07-26 12:27:59 +02:00
games
lib
misc
os-specific
servers
shells
stdenv
test
tools
top-level	Merge remote-tracking branch 'upstream/master' into haskell-snap	2012-07-26 12:27:59 +02:00