nixpkgs/pkgs/applications
Lluís Batlle i Rossell ee04ffcb55 Updating from trunk. I resolved simple conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
2010-12-11 12:47:00 +00:00
..
audio Updating from trunk. I resolved simple conflicts. 2010-12-11 12:47:00 +00:00
display-managers/slim
editors Merging from trunk 2010-11-22 11:39:42 +00:00
graphics Updating from trunk again 2010-11-17 17:03:09 +00:00
misc Updating from trunk. I resolved simple conflicts. 2010-12-11 12:47:00 +00:00
networking Updating from trunk. I resolved simple conflicts. 2010-12-11 12:47:00 +00:00
office Updating from trunk again 2010-11-17 17:03:09 +00:00
science Updating from trunk. I resolved simple conflicts. 2010-12-11 12:47:00 +00:00
taxes
version-management Updating from trunk. I resolved simple conflicts. 2010-12-11 12:47:00 +00:00
video Updating from trunk. I resolved simple conflicts. 2010-12-11 12:47:00 +00:00
virtualization Virtualbox guest additions: fix runtime dep on which. Patch by Rohan Hart. 2010-11-28 10:14:07 +00:00
window-managers Updating from trunk. I resolved simple conflicts. 2010-12-11 12:47:00 +00:00