nixpkgs/pkgs/applications
Eelco Dolstra 0518ccf5af Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/stdenv/generic/default.nix
2014-11-06 10:16:39 +01:00
..
audio Merge remote-tracking branch 'origin/master' into staging 2014-11-06 10:16:39 +01:00
display-managers
editors Merge remote-tracking branch 'origin/master' into staging 2014-11-06 10:16:39 +01:00
gis
graphics Turn more licenses into lib.licenses style 2014-11-06 00:48:16 +00:00
inferno
misc Merge remote-tracking branch 'origin/master' into staging 2014-11-06 10:16:39 +01:00
networking Merge remote-tracking branch 'origin/master' into staging 2014-11-06 10:16:39 +01:00
office scribus: update from 1.4.3 to 1.4.4 2014-11-05 23:59:11 +00:00
science Merge remote-tracking branch 'origin/master' into staging 2014-11-06 10:16:39 +01:00
search
taxes
version-management Merge remote-tracking branch 'origin/master' into staging 2014-11-06 10:16:39 +01:00
video Merge remote-tracking branch 'origin/master' into staging 2014-11-06 10:16:39 +01:00
virtualization virtualbox: 4.3.16 -> 4.3.18 2014-11-03 21:47:59 +01:00
window-managers Turn more licenses into lib.licenses style 2014-11-06 00:48:16 +00:00