Vladimír Čunát 1e389c976c merge 'staging' into modular-stdenv ... In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix were not merged correctly. Conflicts: pkgs/stdenv/generic/default.nix		2014-09-08 18:16:54 +02:00
..
bad	gst-plugins-bad: update to 1.4.0	2014-07-22 18:16:41 +08:00
base	gst_1 base plugins: enableParallelBuilding	2014-08-12 22:17:38 +02:00
core	merge 'staging' into modular-stdenv	2014-09-08 18:16:54 +02:00
ges	gst-1 gnonlin and editing-services: maintenance update	2014-08-12 22:35:49 +02:00
gnonlin	gst-1 gnonlin and editing-services: maintenance update	2014-08-12 22:35:49 +02:00
good	gst-plugins-good: update to 1.4.0	2014-07-22 18:16:18 +08:00
legacy	Cleanup: Use += to append to envHooks	2014-08-09 12:47:05 +02:00
libav	gst-libav: update to 1.4.0	2014-07-22 18:17:13 +08:00
python	gst_1 python: bugfix update	2014-08-12 22:18:25 +02:00
ugly	gst-plugins-ugly: update to 1.4.0	2014-07-22 18:16:56 +08:00
default.nix	add gst-editing-services 1.2.0	2014-03-17 22:06:32 +08:00