Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18

# Conflicts:
#	browser/app/profile/firefox.js
#	browser/components/preferences/jar.mn

1 files changed, 2 insertions, 2 deletions

diff --git a/gfx/angle/src/tests/compiler_tests/API_test.cpp b/gfx/angle/src/tests/compiler_tests/API_test.cpp
index 090e31ebc..217a260fa 100755
--- a/gfx/angle/src/tests/compiler_tests/API_test.cpp
+++ b/gfx/angle/src/tests/compiler_tests/API_test.cpp
@@ -15,11 +15,11 @@ TEST(APITest, CompareShBuiltInResources)
 {
     ShBuiltInResources a_resources;
     memset(&a_resources, 88, sizeof(a_resources));
-    sh::InitBuiltInResources(&a_resources);
+    ShInitBuiltInResources(&a_resources);
 
     ShBuiltInResources b_resources;
     memset(&b_resources, 77, sizeof(b_resources));
-    sh::InitBuiltInResources(&b_resources);
+    ShInitBuiltInResources(&b_resources);
 
     EXPECT_TRUE(memcmp(&a_resources, &b_resources, sizeof(a_resources)) == 0);
 }