Vladimír Čunát 4c5a71f777 Merge master into x-updates ... Conflicts: pkgs/desktops/gnome-2/desktop/gvfs/default.nix pkgs/development/libraries/cogl/default.nix pkgs/development/libraries/libsoup/2.44.nix		2013-12-18 23:21:29 +01:00
..
flashplayer-11	flashplayer: Update to 11.2.202.310 (fixes 4 critical security vulnerabilities)	2013-11-07 11:44:18 +01:00
fribid	fribid: fix build via using gtk2 instead of gtk3	2013-12-10 13:27:07 +01:00
gecko-mediaplayer
gmtk	gmtk: update from 1.0.5 to 1.0.8	2013-12-16 01:36:18 +02:00
google-talk-plugin
mozplugger
mplayerplug-in
nspluginwrapper