Peter Simons 144a833cd0 Merge pull request #1259 from ocharles/haskell ... haskellPackages.socketActivation and haskellPackages.quickcheckInstances		2013-11-21 01:25:34 -08:00
..
applications	Merge pull request #1245 from nathanielbaxter/dev/openbox	2013-11-21 00:34:19 -08:00
build-support	clang-wrapper: Optionally use libc++ instead of libstdc++.	2013-11-16 13:53:48 +01:00
data
desktops	xfce: enable tumbler the thumbnail manager (close #1206)	2013-11-16 16:58:08 +01:00
development	Merge pull request #1259 from ocharles/haskell	2013-11-21 01:25:34 -08:00
games	Update xonotic to 0.7.	2013-11-21 09:41:01 +01:00
misc	wine: (stable) bugfix update 1.6 -> 1.6.1	2013-11-16 18:22:16 +01:00
os-specific	linux: Update to 3.11.8 (close #1243)	2013-11-20 22:48:12 +01:00
servers	Merge pull request #1234 from lovek323/mpd	2013-11-21 00:38:24 -08:00
shells
stdenv	mkDerivation: Set meta.position to the source file of the derivation	2013-11-19 14:58:47 +01:00
test
tools	Merge pull request #1239 from grwlf/yandex-disk	2013-11-21 00:35:45 -08:00
top-level	Merge pull request #1259 from ocharles/haskell	2013-11-21 01:25:34 -08:00