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

..

audio

Updating from trunk. I resolved simple conflicts.

2010-12-11 12:47:00 +00:00

display-managers/slim

Fixing the slim build in gcc 4.4

2010-01-16 15:02:46 +00:00

editors

Merging from trunk. I solved some trivial merge conflicts.

2010-12-17 20:39:58 +00:00

graphics

Merging from trunk. I solved some trivial merge conflicts.

2010-12-17 20:39:58 +00:00

misc

Merging from trunk. I solved some trivial merge conflicts.

2010-12-17 20:39:58 +00:00

networking

Merging from trunk. I solved some trivial merge conflicts.

2010-12-17 20:39:58 +00:00

office

Updating from trunk again

2010-11-17 17:03:09 +00:00

science

SimGrid 3.5.

2010-12-17 17:48:12 +00:00

taxes

* aangifte2009 requires xdg-utils to open a browser.

2010-03-25 20:39:01 +00:00

version-management

Merging from trunk. I solved some trivial merge conflicts.

2010-12-17 20:39:58 +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