Tuomas Tynkkynen 8c4aeb1780 Merge staging into master ... Brings in: - changed output order for multiple outputs: https://github.com/NixOS/nixpkgs/pull/14766 - audit disabled by default https://github.com/NixOS/nixpkgs/pull/17916 Conflicts: pkgs/development/libraries/openldap/default.nix		2016-09-01 13:27:27 +03:00
..
bad	treewide: Shuffle outputs	2016-08-29 14:49:51 +03:00
base	treewide: Shuffle outputs	2016-08-29 14:49:51 +03:00
core	treewide: Shuffle outputs	2016-08-29 14:49:51 +03:00
ges	treewide: Shuffle outputs	2016-08-29 14:49:51 +03:00
gnonlin	treewide: Shuffle outputs	2016-08-29 14:49:51 +03:00
good	treewide: Shuffle outputs	2016-08-29 14:49:51 +03:00
gstreamermm	treewide: Shuffle outputs	2016-08-29 14:49:51 +03:00
legacy	gst_plugins_good: fix minimalDeps build	2016-08-31 15:40:07 +03:00
libav	treewide: Shuffle outputs	2016-08-29 14:49:51 +03:00
python	treewide: Shuffle outputs	2016-08-29 14:49:51 +03:00
qt-gstreamer	treewide: Shuffle outputs	2016-08-29 14:49:51 +03:00
ugly	treewide: Shuffle outputs	2016-08-29 14:49:51 +03:00
vaapi	treewide: Shuffle outputs	2016-08-29 14:49:51 +03:00
validate	treewide: Shuffle outputs	2016-08-29 14:49:51 +03:00
default.nix	Merge branch 'master' into closure-size	2016-04-01 10:06:01 +02:00