Vladimír Čunát dfdf164f87 Merge master into x-updates ... Conflicts (trivial): pkgs/games/spring/default.nix		2014-02-10 19:15:58 +01:00
..
applications	thunderbird: simple esr bump (Nov 2013), incl. CVE	2014-02-10 18:40:18 +01:00
build-support	Merge pull request #1674 from errge/haddockhoogle	2014-02-06 22:46:12 +01:00
data	Merge master into x-updates	2014-02-10 19:15:58 +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 master into x-updates	2014-02-10 19:15:58 +01:00
games	springlobby: add unitsync patch	2014-02-10 14:21:42 +01:00
misc	Merge pull request #1583 from MarcWeber/submit/drop-myhasktags	2014-01-25 04:24:12 -08:00
os-specific	Merge master into x-updates	2014-02-10 19:15:58 +01:00
servers	Merge master into x-updates	2014-02-02 10:05:25 +01:00
shells
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	Merge master into x-updates	2014-02-10 19:15:58 +01:00