Yury G. Kudryashov 215a07c1a9 svn merge ^/nixpkgs/trunk ... Merge conflicts: * unzip (almost trivial) * dvswitch (trivial) * gmp (copied result of `git merge`) The last item introduced gmp-5.0.3, thus full rebuild. +ensureDir->mkdir -p in TeX packages was catched by git but not svn. svn path=/nixpkgs/branches/stdenv-updates/; revision=32091		2012-02-06 23:03:12 +00:00
..
browsers	svn merge ^/nixpkgs/trunk	2012-02-06 23:03:12 +00:00
cluster/rq
ekiga
esniper	esniper: updated to version 2.27.0	2012-02-06 21:26:46 +00:00
instant-messengers	svn merge ^/nixpkgs/trunk	2012-01-26 15:27:03 +00:00
iptraf	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
irc	Update of XChat to 2.8.8; old version 2.8.4 does not compile.	2012-01-11 22:32:17 +00:00
kphone	State qt version (3/4) in packages, not in all-packages.nix	2012-01-07 17:06:49 +00:00
linphone
mailreaders	svn merge ^/nixpkgs/trunk	2012-01-26 15:27:03 +00:00
msmtp
mumble	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
netperf
newsreaders	kwooty expression: slight improvement of the build inputs.	2012-01-26 23:24:40 +00:00
offrss	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
p2p	svn merge ^/nixpkgs/trunk, one simple conflict in jruby	2012-01-19 21:31:51 +00:00
pjsip	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
remote	Updating rdesktop to 1.7.1	2012-02-03 16:16:18 +00:00
siproxd
skype	svn merge ^/nixpkgs/trunk	2012-02-06 23:03:12 +00:00
sniffers	wireshark: updated to version 1.6.2	2011-11-14 15:11:23 +00:00
sync	svn merge ^/nixpkgs/trunk, one simple conflict in jruby	2012-01-19 21:31:51 +00:00
twinkle	State qt version (3/4) in packages, not in all-packages.nix	2012-01-07 17:06:49 +00:00
vnstat	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
yafc