Lluís Batlle i Rossell b48b2a7bb4 Merging from trunk. I solved some trivial merge conflicts. ... svn path=/nixpkgs/branches/stdenv-updates/; revision=25188		2010-12-17 20:39:58 +00:00
..
admin	pkgs/tools/admin/tightvnc: move --mandir and --infodir to standard locations	2010-12-06 18:01:51 +00:00
archivers	GNU tar 1.25.	2010-12-12 23:35:27 +00:00
backup	Making duplicity's rdiffdir work (it had to be wrapped)	2010-06-05 15:06:12 +00:00
bluetooth	* Add some packages to the channel.	2010-10-21 11:18:30 +00:00
cd-dvd	* Add UNetbootin to the channel.	2010-08-11 13:55:56 +00:00
compression	Updating from trunk. I resolved simple conflicts.	2010-12-11 12:47:00 +00:00
filesystems	Updating from trunk. I resolved simple conflicts.	2010-12-11 12:47:00 +00:00
graphics	Applying some patches from Debian to build it with fresh OpenCV	2010-10-14 15:44:58 +00:00
misc	Merging from trunk. I solved some trivial merge conflicts.	2010-12-17 20:39:58 +00:00
networking	Updating from trunk. I resolved simple conflicts.	2010-12-11 12:47:00 +00:00
package-management	Updated Disnix packages and added disnixos	2010-12-17 18:42:02 +00:00
pydb	* Get rid of many instances of "args: with args;", and other coding	2010-07-28 11:55:54 +00:00
security	tor:version bump	2010-12-01 04:07:44 +00:00
system	GNU acct 6.5.5.	2010-12-12 20:19:43 +00:00
text	GNU wdiff 0.6.5.	2010-12-12 20:19:48 +00:00
typesetting	Lout: Update the homepage.	2010-09-21 12:50:39 +00:00
video	* Get rid of many instances of "args: with args;", and other coding	2010-07-28 11:55:54 +00:00
virtualization	* Updated the EC2 API/AMI tools.	2010-07-13 20:58:58 +00:00
X11	Updating from trunk. I resolved simple conflicts.	2010-12-11 12:47:00 +00:00