Merge branch 'upstream' into dev-whitespace

Conflicts:
	bucket/go.json
This commit is contained in:
Roy Ivy III 2015-08-25 22:32:56 -05:00
commit 3684c02f23
2 changed files with 8 additions and 8 deletions

10
go.json
View File

@ -1,15 +1,15 @@
{
"version": "1.4.2",
"version": "1.5",
"homepage": "http://golang.org",
"license": "http://golang.org/LICENSE",
"architecture": {
"64bit": {
"url": "https://storage.googleapis.com/golang/go1.4.2.windows-amd64.zip",
"hash": "sha1:91b229a3ff0a1ce6e791c832b0b4670bfc5457b5"
"url": "https://storage.googleapis.com/golang/go1.5.windows-amd64.zip",
"hash": "sha1:559cddfd341c20531689efad5412dcc304f8d85b"
},
"32bit": {
"url": "https://storage.googleapis.com/golang/go1.4.2.windows-386.zip",
"hash": "sha1:0e074e66a7816561d7947ff5c3514be96f347dc4"
"url": "https://storage.googleapis.com/golang/go1.5.windows-386.zip",
"hash": "sha1:f5014cd70be18b79bc401f1e35c8d73062124bf0"
}
},
"extract_dir": "go",

View File

@ -1,9 +1,9 @@
{
"homepage": "http://premake.github.io/",
"version": "5.0-alpha4",
"version": "5.0.0-alpha5",
"license": "BSD 3-Clause",
"url": "https://github.com/premake/premake-core/releases/download/v5.0.0.alpha4/premake-5.0.0.alpha4-windows.zip",
"hash": "3c6aad98305ab28733c9051acf90812773bee80587d892a5cf66f15dc5c76a5a",
"url": "https://github.com/premake/premake-core/releases/download/v5.0.0-alpha5/premake-5.0.0-alpha5-windows.zip",
"hash": "11a63daf363a77f60187e2af70e73441f6f1ca8c64369ee42018ceb0404b5b36",
"bin": [
"premake5.exe"
],