Tuomas Tynkkynen 4c6c919a31 Merge remote-tracking branch 'upstream/master' into HEAD ... Conflicts: pkgs/os-specific/linux/kernel/generic.nix		2018-02-07 03:41:24 +02:00
..
applications	Merge remote-tracking branch 'upstream/master' into HEAD	2018-02-07 03:41:24 +02:00
build-support	way-cooler: 0.6.2 -> 0.8.0	2018-02-04 05:17:53 +03:00
common-updater	update-source-version: Name part of name can contain dashes	2017-12-26 20:02:01 +02:00
data	Merge remote-tracking branch 'upstream/master' into staging	2018-02-03 02:50:21 +02:00
desktops	Merge pull request #34526 from ttuegel/bugfix/plasma-integration/font-style	2018-02-04 17:41:50 -06:00
development	Merge remote-tracking branch 'upstream/master' into HEAD	2018-02-07 03:41:24 +02:00
games	assaultcube: init at official master branch , rev = "9f537b0876a39d7686e773040469fbb1417de18b" (#34623)	2018-02-05 16:06:49 +01:00
misc	greybird: 3.22.5 -> 3.22.6	2018-02-04 09:08:17 -02:00
os-specific	Merge remote-tracking branch 'upstream/master' into HEAD	2018-02-07 03:41:24 +02:00
servers	cassandra: 3.0.9 -> 3.0.15	2018-02-07 09:09:04 +08:00
shells	elvish: 0.10 -> 0.11	2018-01-31 23:32:49 +01:00
stdenv	unpackPhase: Handle sources starting with a hyphen	2018-01-24 21:58:57 -08:00
test	sierra-shared-test: fix build	2018-01-05 23:20:55 +01:00
tools	Merge remote-tracking branch 'upstream/master' into HEAD	2018-02-07 03:41:24 +02:00
top-level	Merge remote-tracking branch 'upstream/master' into HEAD	2018-02-07 03:41:24 +02:00