Vladimír Čunát b4af993c3f Merge branch 'master' into staging ... Conflicts (simple): pkgs/development/lisp-modules/clwrapper/setup-hook.sh		2014-11-14 14:28:23 +01:00
..
audio	Merge branch 'master' into staging	2014-11-14 14:28:23 +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 branch 'master' into staging	2014-11-14 14:28:23 +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 branch 'master' into staging	2014-11-14 14:28:23 +01:00
networking	Merge branch 'master' into staging	2014-11-14 14:28:23 +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
version-management	Merge branch 'master' into staging	2014-11-14 14:28:23 +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