Merge pull request #813 from google/dev

Merge dev into master
google · Dec 10, 2019 · 53f042b · 53f042b
2 parents 143f46a + 61bdedc
commit 53f042b
Show file tree

Hide file tree

Showing 512 changed files with 32,604 additions and 5,204 deletions.
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -17,3 +17,7 @@ Imperial College London
  David MacIver
  Dragos Martac
  Paul Thomson
+
+Independent contributors via Google Summer of Code
+ Abel Briggs
+ Jiradet Ounjai
diff --git a/assembly-binaries/pom.xml b/assembly-binaries/pom.xml
@@ -58,10 +58,10 @@ limitations under the License.
   </repositories>
 
   <properties>
-    <spirv-tools-version>ac0884b2c8dfd214f0d293c12cf3b5931b1eb345</spirv-tools-version>
+    <spirv-tools-version>b97215064186d731eac68adcc5ade4c7b96b265b</spirv-tools-version>
     <angle-version>9d3202492d78aae5ced08ff14679b81c98d71c15</angle-version>
-    <swiftshader-version>803082da4f73920729938905cb1727e11ff79530</swiftshader-version>
-    <glslang-version>b938f8045de9556bcd763eca362c2443d25c0b77</glslang-version>
+    <swiftshader-version>0565d5aee279a4782689297ada0aa2489e24ad3e</swiftshader-version>
+    <glslang-version>0f167ce7125795df62ae5893f553e5608c9652f4</glslang-version>
     <getimage-version>d987dc0e5f8aeae0dc2f5aac2013e9a3edd54465</getimage-version>
   </properties>
 

diff --git a/assembly-public/pom.xml b/assembly-public/pom.xml
diff --git a/assembly-public/src/main/resources/HASH b/assembly-public/src/main/resources/HASH
diff --git a/assembly-public/src/main/scripts/README.md b/assembly-public/src/main/scripts/README.md
diff --git a/ast/pom.xml b/ast/pom.xml
@@ -68,10 +68,6 @@ limitations under the License.
       <groupId>net.sourceforge.argparse4j</groupId>
       <artifactId>argparse4j</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
 
   </dependencies>