nixpkgs/pkgs/applications/video/omxplayer
Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
..
default.nix Merge remote-tracking branch 'origin/master' into staging. 2014-08-04 16:51:47 +02:00