Eelco Dolstra b7c7550c43 * Replace the Python "magic" module with the (apparently) more ...

common one from the "file" package.

svn path=/nixpkgs/trunk/; revision=25322

2010-12-29 19:19:56 +00:00

..

applications

* Audacious updated to 2.4.2.

2010-12-29 10:39:41 +00:00

build-support

* Sync with the trunk.

2010-12-22 17:02:03 +00:00

data

Some improvements to intl-rich layout

2010-12-17 12:19:34 +00:00

desktops

* Sync with the trunk.

2010-12-28 16:42:00 +00:00

development

Remove unused patch

2010-12-29 18:04:17 +00:00

games

* Sync with the trunk.

2010-12-28 16:42:00 +00:00

lib

Updating from trunk. I resolved simple conflicts.

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

misc

splix-2.0.0: fix compilation with gcc-4.5

2010-12-28 18:47:41 +00:00

os-specific

* Put libvdpau_nvidia.so in a place where libvdpau can find it.

2010-12-27 19:22:30 +00:00

servers

Merging from trunk. I solved some trivial merge conflicts.

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

shells

Updating from trunk. I resolved simple conflicts.

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

stdenv

Making the addCoverageInformation stdenv adapter better in the sense that it

2010-11-30 14:10:52 +00:00

test

…

tools

* Replace the Python "magic" module with the (apparently) more

2010-12-29 19:19:56 +00:00

top-level

* Replace the Python "magic" module with the (apparently) more

2010-12-29 19:19:56 +00:00