Luca Bruno aa800fa0fe Merge branch 'master' into staging		2015-06-15 09:56:29 +02:00
..
applications	Merge branch 'master' into staging	2015-06-15 09:56:29 +02:00
build-support	Merge branch 'master.upstream' into staging.upstream	2015-06-12 13:47:46 -07:00
data	nixos-artwork: only download the necessary artwork	2015-06-12 11:45:58 +02:00
desktops	Merge branch 'master' into staging	2015-06-15 09:56:29 +02:00
development	Merge branch 'master' into staging	2015-06-15 09:56:29 +02:00
games	Add Tales of Maj'eyal game.	2015-06-14 17:44:38 +01:00
misc	hplip 3.15.4 -> 3.15.6	2015-06-13 16:14:40 +02:00
os-specific	Merge branch 'master' into staging	2015-06-15 09:56:29 +02:00
servers	Merge branch 'master' into staging	2015-06-15 09:56:29 +02:00
shells	zsh: update from 5.0.7 to 5.0.8	2015-06-08 12:55:38 +02:00
stdenv	stdenv/linux: Link statically against isl & cloog	2015-06-12 01:38:47 +02:00
test
tools	Merge branch 'master' into staging	2015-06-15 09:56:29 +02:00
top-level	Merge branch 'master' into staging	2015-06-15 09:56:29 +02:00