Yury G. Kudryashov 84c0185038 svn merge ^/nixpkgs/trunk, one simple conflict in jruby ... svn path=/nixpkgs/branches/stdenv-updates/; revision=31721		2012-01-19 21:31:51 +00:00
..
catdoc
cheetah-template
colordiff
convertlit	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
dadadodo	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
diffstat
diffutils
dos2unix
ebook-tools
enscript
gawk
gnugrep	* Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.	2012-01-18 20:53:01 +00:00
gnupatch
gnused
groff
highlight
html-tidy
kdiff3
mairix
mpage
multitran
namazu
odt2txt
patchutils
qshowdiff	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
recode
replace	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
sgml
source-highlight	GNU Source-Highlight 3.1.6.	2012-01-18 20:52:55 +00:00
uni2ascii
wdiff
xml	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00