Merge branch 'v1.6'

oowekyala · Apr 22, 2020 · 5a7f377 · 5a7f377
2 parents 1f1637f + 2f36651
commit 5a7f377
Show file tree

Hide file tree

Showing 88 changed files with 1,405 additions and 1,080 deletions.
diff --git a/.gitignore b/.gitignore
@@ -168,3 +168,4 @@ jjtricks/build
 src/test/testGen/gen/
 jjtricks/src/test/testGen/gen/
 prepare-deps/build
+.idea/intellij-javadocs-4.0.1.xml
diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules/core/intellij-javacc.core.main.iml b/.idea/modules/core/intellij-javacc.core.main.iml