Shea Levy acd4299e75 Merge branch 'master' into stdenv-updates ... Conflicts: pkgs/applications/networking/browsers/chromium/default.nix pkgs/top-level/all-packages.nix Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.		2013-02-21 11:13:30 -05: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	Merge branch 'upstream-master' into stdenv-updates	2013-02-19 10:09:39 -05:00
graphics	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
misc	Merge branch 'master' into stdenv-updates	2013-02-21 11:13:30 -05:00
networking	Merge branch 'master' into stdenv-updates	2013-02-21 11:13:30 -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	* It's that time of year again.	2012-03-10 19:23:04 +00:00
version-management	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-02-18 11:54:56 +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