Vladimír Čunát ac6761c908 Merge master into stdenv-updates ... Conflicts: pkgs/applications/version-management/gource/default.nix pkgs/top-level/all-packages.nix		2014-01-20 19:39:28 +01:00
..
ascii
catdoc
cheetah-template
colordiff
convertlit
dadadodo
diffstat	diffstat: update from 1.45 to 1.58	2013-12-11 09:47:45 +02:00
diffutils
dos2unix	dos2unix: update from 6.0.3 to 6.0.4	2014-01-13 17:28:42 +01:00
ebook-tools
enca	enca: update dependencies	2013-12-18 18:18:25 +02:00
enscript	enscript: update from 1.6.5.2 to 1.6.6	2013-12-15 12:35:47 +02:00
gawk
gnugrep
gnupatch
gnused
groff
highlight	highlight: update from 3.5 to 3.9	2013-12-18 18:18:31 +02:00
html-tidy
kdiff3
mairix	mairix: update from 0.22 to 0.23	2013-12-21 04:07:50 +02:00
mpage
multitran
namazu	namazu: update from 2.0.20 to 2.0.21	2013-12-21 02:28:24 +02:00
numdiff	numdiff: update from 5.6.1 to 5.8.1	2013-12-21 04:00:19 +02:00
odt2txt
patchutils
podiff
poedit
qshowdiff
recode
replace
sgml	sp-compat: Fix build	2014-01-17 12:13:20 +01:00
silver-searcher	silver-search: Add	2014-01-19 17:42:43 +01:00
source-highlight	source-highlight: Don't do a parallel build	2013-12-16 17:03:19 +01:00
uni2ascii
unoconv
wdiff
wgetpaste
xml