Merge remote-tracking branch 'upstream/master' into previewOrder

PaulaRudy · PaulaRudy · commit 011181954305 · 2015-12-11T14:29:22.000-05:00
diff --git a/build.gradle b/build.gradle
@@ -57,7 +57,7 @@ allprojects {
     }
 }
 
-def os = osdetector.classifier.replace("osx", "macosx")
+def os = osdetector.classifier.replace("osx", "macosx").replace("windows-x86_32", "windows-x86")
 
 project(":core") {
     apply plugin: 'java'

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ allprojects {`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
`60`		`-def os = osdetector.classifier.replace("osx", "macosx")`
	`60`	`+def os = osdetector.classifier.replace("osx", "macosx").replace("windows-x86_32", "windows-x86")`
`61`	`61`
`62`	`62`	`project(":core") {`
`63`	`63`	`apply plugin: 'java'`