Peter Simons b33ad366a1 Merge branch 'master' into stdenv-updates.		2013-01-11 15:46:10 +01:00
..
audio	Merge branch 'master' into stdenv-updates.	2013-01-11 15:46:10 +01:00
display-managers/slim
editors	Merge branch 'master' into stdenv-updates.	2013-01-11 15:46:10 +01:00
graphics	Merge branch 'master' into stdenv-updates.	2013-01-11 15:46:10 +01:00
misc	Merge branch 'master' into stdenv-updates.	2013-01-11 15:46:10 +01:00
networking	Merge branch 'master' into stdenv-updates.	2013-01-11 15:46:10 +01:00
office	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
science	Merge branch 'master' into stdenv-updates.	2013-01-11 15:46:10 +01:00
taxes
version-management	Merge branch 'master' into stdenv-updates.	2013-01-11 15:46:10 +01:00
video	xbmc: add version 11	2013-01-05 23:33:50 +01:00
virtualization	Merge branch 'master' into stdenv-updates.	2013-01-11 15:46:10 +01:00
window-managers	haskell-xmonad-extras: update to version 0.11	2013-01-09 16:54:29 +01:00