Peter Simons 1c5647c817 Merge pull request #1716 from ocharles/haskellPackages.diff3 ... haskellPackages.diff3: New expression		2014-02-10 10:52:11 +01:00
..
applications	Weechat: Update to 0.4.3	2014-02-09 12:42:26 +01:00
build-support	Merge pull request #1674 from errge/haddockhoogle	2014-02-06 22:46:12 +01:00
data	andagii: fix fetch by providing a different user-agent	2014-02-08 11:16:22 +01:00
desktops	libqmi: 1.0 -> 1.8.0, move outside gnome3 namespace, fix build	2014-02-08 20:17:00 +01:00
development	Merge pull request #1716 from ocharles/haskellPackages.diff3	2014-02-10 10:52:11 +01:00
games	spring: don't pass glibc	2014-02-10 09:41:30 +01:00
misc	Merge pull request #1583 from MarcWeber/submit/drop-myhasktags	2014-01-25 04:24:12 -08:00
os-specific	grsecurity: Update stable and test patches	2014-02-08 16:16:58 +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	Upgrade bumblebee and add nixos module	2014-02-09 15:09:41 +01:00
top-level	haskellPackages.diff3: New expression	2014-02-09 12:27:41 +00:00