Merge.

Swatinem · Jul 2, 2011 · 1f65513 · 1f65513
2 parents ffee929 + 67aa729
commit 1f65513
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/js/Config.js b/js/Config.js
@@ -182,6 +182,11 @@ var Config = {
       hasGroups: true,
       buildbotBranch: "mozilla-release",
     },
+    "Fx-Team": {
+      primaryRepo: "integration/fx-team",
+      hasGroups: true,
+      buildbotBranch: "fx-team",
+    },
   },
   groupedMachineTypes: {
     "Mochitest" : ["Mochitest"],
@@ -244,6 +249,12 @@ var Config = {
     "tp4_rss",
     "tp4_shutdown",
     "tp4_xres",
+    "tp5",
+    "tp5_memset",
+    "tp5_pbytes",
+    "tp5_rss",
+    "tp5_shutdown",
+    "tp5_xres",
     "dromaeo_basics",
     "dromaeo_css",
     "dromaeo_dom",