Peter Simons ec6b82a0c2 Merge branch 'master' into staging.		2015-01-19 18:41:17 +01:00
..
applications	Merge branch 'master' into staging.	2015-01-19 18:41:17 +01:00
build-support	Merge branch 'master' into staging.	2015-01-19 18:41:17 +01:00
data	Add package for the 'open-dyslexic' font.	2015-01-17 00:49:54 +01:00
desktops	Merge branch 'master' into staging.	2015-01-19 18:41:17 +01:00
development	Merge branch 'master' into staging.	2015-01-19 18:41:17 +01:00
games	Merge branch 'master' into staging.	2015-01-19 18:41:17 +01:00
misc	rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc	2015-01-14 20:27:55 -08:00
os-specific	Merge branch 'master' into staging.	2015-01-19 18:41:17 +01:00
servers	Merge branch 'master' into staging.	2015-01-19 18:41:17 +01:00
shells	nixpkgs: remove redundant attribute sip	2014-12-23 19:37:21 +01:00
stdenv	mpc: also rename the attribute to libmpc	2015-01-17 09:55:32 +01:00
test	Merge recent master into staging	2014-09-13 21:48:29 +02:00
tools	Merge branch 'master' into staging.	2015-01-19 18:41:17 +01:00
top-level	Merge branch 'master' into staging.	2015-01-19 18:41:17 +01:00