Merge remote-tracking branch 'origin/master' into stdenv-updates

This commit is contained in:
Eelco Dolstra
2013-03-07 19:33:52 +01:00
121 changed files with 1677 additions and 727 deletions
+1 -1
View File
@@ -333,7 +333,7 @@ in
ffado = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
ffmpeg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
ffmpeg_0_6_90 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
ffmpeg_1_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
ffmpeg_1_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
fileschanged = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
fio = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
firefox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };