Merge remote-tracking branch 'bruce/master' into javap

Justin Ryan · Justin Ryan · commit 91fd557a7b04 · 2016-07-31T02:37:19.000-07:00
# Conflicts:
#	build.gradle
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,5 @@
 import org.gradle.internal.jvm.Jvm
 import org.apache.tools.ant.util.TeeOutputStream
-// TODO: test for tags that span multiple lines
 boolean debug = false 
 
 class Tags {
diff --git a/gg.bat b/gg.bat
@@ -0,0 +1 @@
+gradlew  %*
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-3.1-20160730000026+0000-bin.zip
