Rok Garbas 614e9b65a0 Merge pull request #318 from iElectric/xbmc-nasm ... add nasm to xbmc dependencies		2013-02-17 15:46:17 -08:00
..
audio	Merge remote-tracking branch 'upstream/master' into stdenv-updates	2013-02-17 08:19:40 -05:00
display-managers/slim	consolekit: Remove	2012-12-13 11:30:18 +01:00
editors	vim: fix a typo from commit ab3eea	2013-02-05 17:51:30 +01:00
graphics	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
misc	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
networking	Merge remote-tracking branch 'upstream/master' into stdenv-updates	2013-02-17 08:19:40 -05:00
office	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
science	Revert "WIP", sorry, I got confused, somehow	2013-02-17 11:02:25 +01:00
taxes
version-management	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
video	add nasm to xbmc dependencies	2013-02-16 23:23:15 +01:00
virtualization	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
window-managers	xmonad: install man page into the proper location	2013-02-11 23:26:06 +01:00