Eelco Dolstra 4970574409 Merge remote-tracking branch 'origin/gcc-4.9' into staging ... Conflicts: pkgs/development/libraries/wayland/default.nix		2015-06-11 00:23:03 +02:00
..
applications	Merge remote-tracking branch 'origin/gcc-4.9' into staging	2015-06-11 00:23:03 +02:00
build-support	Merge remote-tracking branch 'origin/gcc-4.9' into staging	2015-06-11 00:23:03 +02:00
data	nixos-artwork: Make into a derivation and use fetchfromgithub	2015-06-08 18:32:32 -07:00
desktops	Merge remote-tracking branch 'origin/master' into staging	2015-06-11 00:18:24 +02:00
development	Merge remote-tracking branch 'origin/gcc-4.9' into staging	2015-06-11 00:23:03 +02:00
games	chocolate-doom: update from 2.1.0 to 2.2.0	2015-06-10 09:00:47 +02:00
misc	bump dolphinEmuMaster, now needs gcc5 to compile	2015-06-09 03:24:18 -07:00
os-specific	Merge remote-tracking branch 'origin/gcc-4.9' into staging	2015-06-11 00:23:03 +02:00
servers	Merge remote-tracking branch 'origin/gcc-4.9' into staging	2015-06-11 00:23:03 +02:00
shells	zsh: update from 5.0.7 to 5.0.8	2015-06-08 12:55:38 +02:00
stdenv	Merge remote-tracking branch 'origin/gcc-4.9' into staging	2015-06-11 00:23:03 +02:00
test
tools	Merge remote-tracking branch 'origin/gcc-4.9' into staging	2015-06-11 00:23:03 +02:00
top-level	Merge remote-tracking branch 'origin/gcc-4.9' into staging	2015-06-11 00:23:03 +02:00