Eelco Dolstra 01f19f54e0 Merge remote-tracking branch 'origin/master' into systemd-219 ... Conflicts: pkgs/os-specific/linux/systemd/fixes.patch pkgs/os-specific/linux/upower/0.99.nix pkgs/top-level/all-packages.nix		2015-09-21 12:57:30 +02:00
..
applications	Merge remote-tracking branch 'origin/master' into systemd-219	2015-09-21 12:57:30 +02:00
build-support	nix-prefetch-git: pull all tags from remote when checkouting by revision	2015-09-20 18:24:34 +02:00
data	noto-fonts-emoji: fixup chrooted build	2015-09-21 11:32:06 +02:00
desktops	Merge remote-tracking branch 'origin/master' into systemd-219	2015-09-21 12:57:30 +02:00
development	Merge remote-tracking branch 'origin/master' into systemd-219	2015-09-21 12:57:30 +02:00
games	hackage-packages.nix: switch our default package set to Stackage Nightly	2015-09-19 08:20:40 +02:00
misc	mgba: use Qt 5.4	2015-09-19 10:01:25 -05:00
os-specific	Merge remote-tracking branch 'origin/master' into systemd-219	2015-09-21 12:57:30 +02:00
servers	samba: 4.2.3 -> 4.3.0	2015-09-18 14:52:51 -07:00
shells	Merge commit 'a6f6c0e' into master.upstream	2015-09-15 12:16:49 -07:00
stdenv	Enable separate debug info	2015-09-17 15:56:33 +02:00
test
tools	Merge remote-tracking branch 'origin/master' into systemd-219	2015-09-21 12:57:30 +02:00
top-level	Merge remote-tracking branch 'origin/master' into systemd-219	2015-09-21 12:57:30 +02:00