nixpkgs/pkgs/applications
Eelco Dolstra f33fa1b66b Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/boost/generic.nix
2014-11-11 23:48:08 +01:00
..
audio Merge remote-tracking branch 'origin/master' into staging 2014-11-11 23:48:08 +01:00
backup/crashplan crashplan: added myself as maintainer 2014-09-27 13:05:04 +01:00
display-managers fix sha for a slim's theme 2014-11-08 22:40:36 +03:00
editors Merge remote-tracking branch 'origin/master' into staging 2014-11-11 23:48:08 +01:00
gis qgis: disable parallel building 2014-10-13 15:32:50 +02:00
graphics Fixed many descriptions 2014-11-11 14:36:34 +01:00
inferno Add missing 's' in remaining meta.maintainer(s) attrs 2014-07-22 23:49:21 +02:00
misc Merge remote-tracking branch 'origin/master' into staging 2014-11-11 23:48:08 +01:00
networking Merge remote-tracking branch 'origin/master' into staging 2014-11-11 23:48:08 +01:00
office Apparently there is no need to unpack the tarballs on our own as LibreOffice would prefer to unpack them on its own and sometimes fails if we do unpack them 2014-11-09 15:18:12 +03:00
science Merge remote-tracking branch 'origin/master' into staging 2014-11-11 23:48:08 +01:00
search Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
taxes Add aangifte-2013 2014-03-01 16:54:16 +01:00
version-management Merge branch 'master' into staging 2014-11-10 10:03:52 +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