Yury G. Kudryashov 38e3d7bc86 svn merge ^/nixpkgs/trunk ... Not merged r32497 (tree conflict, glibc GNU Hurd update). Ludovic, could you please look at this? svn path=/nixpkgs/branches/stdenv-updates/; revision=32520		2012-02-23 20:06:21 +00:00
..
flashplayer-9
flashplayer-10
flashplayer-11
gecko-mediaplayer	gecko-mediaplayer: updated to version 1.0.5	2012-02-23 18:32:42 +00:00
gmtk	gecko-mediaplayer: updated to version 1.0.5	2012-02-23 18:32:42 +00:00
google-talk-plugin
mozplugger
mplayerplug-in