Vladimír Čunát 3967a1c444 spring: disable parallel building, as it breaks on Hydra ... (cherry picked from commit e43018e019)		2014-02-08 09:15:20 +01:00
..
applications	netbeans: Bump to version 7.4	2014-02-07 13:20:52 +01:00
build-support	Merge pull request #1674 from errge/haddockhoogle	2014-02-06 22:46:12 +01:00
data	Adopt more packages.	2014-01-28 18:11:00 +01:00
desktops	gnome3: add missing files	2014-02-07 00:37:17 +01:00
development	Merge pull request #1703 from PkmX/pr-ibus	2014-02-08 08:38:18 +01:00
games	spring: disable parallel building, as it breaks on Hydra	2014-02-08 09:15:20 +01:00
misc	Merge pull request #1583 from MarcWeber/submit/drop-myhasktags	2014-01-25 04:24:12 -08:00
os-specific	Merge pull request #1698 from wkennington/master.kernel	2014-02-07 06:42:53 +01:00
servers	Revert "Revert "dictd: Update to latest upstream (0.12.1)."" and add the	2014-01-31 13:18:06 +01:00
shells	Merge master into stdenv-updates	2013-12-29 10:01:22 +01:00
stdenv	Turn the coverage analysis stdenv adapters into setup hooks	2014-02-05 19:18:33 +01:00
test
tools	Add fakechroot	2014-02-06 21:35:20 +00:00
top-level	libchop: fix build by reverting to gnutls31	2014-02-08 09:01:16 +01:00