Shea Levy e13c058fd2 Merge branch 'makemkv.130223.0' of git://github.com/jcumming/nixpkgs ... This adds the proprietary makemkv package to convert dvd and blu-ray videos to mkv. I've tested that it builds, nothing more. Signed-off-by: Shea Levy <shea@shealevy.com>		2013-03-08 17:26:53 -05:00
..
applications	Merge branch 'makemkv.130223.0' of git://github.com/jcumming/nixpkgs	2013-03-08 17:26:53 -05:00
build-support	Merge branch 'vlada/xfce-notg' of git://github.com/vcunat/nixpkgs	2013-03-08 17:03:22 -05:00
data	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-01-17 14:19:14 +01:00
desktops	Merge branch 'vlada/xfce-notg' of git://github.com/vcunat/nixpkgs	2013-03-08 17:03:22 -05:00
development	ocamlPackages.opam: Fix indentation	2013-03-08 17:12:56 -05:00
games	games/unvanquished: Update to 0.13.1.	2013-03-08 20:58:48 +04:00
lib	Add myself to maintainers, remove 0.9.4, set maintainer for this packge to me	2013-03-08 22:59:54 +01:00
misc	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-03-07 19:33:52 +01:00
os-specific	linux-firmware.git moved, and so did the intel wireless firmware urls.	2013-03-08 07:40:47 -08:00
servers	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-03-07 19:33:52 +01:00
shells	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
stdenv	Enable __ignoreNulls globally	2013-03-07 19:42:01 +01:00
test
tools	Whoops, buildNativeInputs is now nativeBuildInputs	2013-03-08 16:39:09 -05:00
top-level	Merge branch 'makemkv.130223.0' of git://github.com/jcumming/nixpkgs	2013-03-08 17:26:53 -05:00