Eelco Dolstra a85dcf4a00 Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/development/libraries/libav/default.nix pkgs/shells/bash/bash-4.2-patches.nix pkgs/stdenv/generic/default.nix		2014-10-07 00:09:37 +02:00
..
bad
base
core	Merge branch 'staging' into modular-stdenv	2014-09-08 18:24:58 +02:00
ges
gnonlin
good
legacy	Merge branch 'staging' into modular-stdenv	2014-09-08 18:24:58 +02:00
libav
python
qt-gstreamer	Add non-legacy qt-gstreamer.	2014-09-24 23:48:39 +02:00
ugly
default.nix