Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. ... Conflicts: pkgs/desktops/e18/enlightenment.nix		2014-08-04 16:51:47 +02:00
..
asciidoc	asciidoc: add enableExtraPlugins expression argument	2014-07-20 23:03:27 +02:00
biber	Partially revert 7a45996 some more.	2014-07-28 20:52:47 +02:00
bibtex-tools
djvu2pdf	Don't use ensureDir	2014-07-22 11:01:32 +02:00
docbook2odf
docbook2x	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
fop
halibut	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
hevea
lhs2tex	Fix broken license references.	2014-07-28 11:43:20 +02:00
lout	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
patoline
pdf2djvu
pdfjam
pdftk	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
rubber	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
tex	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
xmlroff
xmlto	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00