Merge branch 'upstream'
Former-commit-id: fb8302cbd232d974462ed7a9c441e766fb70f2aa
This commit is contained in:
commit
ecd85a29b3
@ -1 +1 @@
|
|||||||
b104eb20a460636aef00adf8c55d3abf8ca88263
|
19e890b9c9d765a8483911bdc157a34dfaf4b823
|
@ -1 +1 @@
|
|||||||
6ae1fe0f537edf62089ab5f411f049f90c6d9c64
|
b34f4bfe8b057e58ca03ea83cb601f306190921a
|
@ -2,7 +2,7 @@
|
|||||||
{
|
{
|
||||||
"name": "llvm",
|
"name": "llvm",
|
||||||
"url": "git://github.com/mono/llvm.git",
|
"url": "git://github.com/mono/llvm.git",
|
||||||
"rev": "81376d161cb6c2230834b2dc096ccbdae8d93020",
|
"rev": "c97510286a58f9aaa116fcfdb8b693d5f61910d2",
|
||||||
"remote-branch": "origin/release_60",
|
"remote-branch": "origin/release_60",
|
||||||
"branch": "release_60",
|
"branch": "release_60",
|
||||||
"directory": "llvm"
|
"directory": "llvm"
|
||||||
|
@ -34,7 +34,7 @@ static class Consts
|
|||||||
// Use these assembly version constants to make code more maintainable.
|
// Use these assembly version constants to make code more maintainable.
|
||||||
//
|
//
|
||||||
|
|
||||||
public const string MonoVersion = "5.18.0.198";
|
public const string MonoVersion = "5.18.0.200";
|
||||||
public const string MonoCompany = "Mono development team";
|
public const string MonoCompany = "Mono development team";
|
||||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||||
public const string MonoCopyright = "(c) Various Mono authors";
|
public const string MonoCopyright = "(c) Various Mono authors";
|
||||||
|
@ -1 +1 @@
|
|||||||
f1bcd6da5db5c14c571b96bc7f6556becbbd6f80
|
bc9455fc4548025ad6b04132fe603be994881bf5
|
@ -1 +1 @@
|
|||||||
0d95327e76d56a0637d3108f653071f01a578b4e
|
af59ae54387248745eca273c902da7d5c6ac89b3
|
@ -1 +1 @@
|
|||||||
21d6d8d438c0a77044b1e75cede4bd770f75db7c
|
f88b88d951436b1e14bed4dcb22cfe4db6e2442b
|
Binary file not shown.
@ -1 +1 @@
|
|||||||
ecd6582948e78b7d730ff1cbedb7ac5d9243a0f7
|
cbd9be16315bc40b8db406a77350bfe852e7b7bf
|
@ -1 +1 @@
|
|||||||
eaacc1c7b4091afc9f745a3c5eec0b42ac4234ca
|
b1bc4d43ea4ede8b853e03b765143c78266363be
|
@ -1 +1 @@
|
|||||||
a75bd866047dfc7ad973477648e8acaa2b56cb42
|
92053bb2a1f1686d30cfc60c050ca7e342d2794d
|
@ -1 +1 @@
|
|||||||
3385d9b9c1d52e3bdc2a9625fb90960591639907
|
a082b9b028531e4197a6c2cb943bc48f36ec63e9
|
@ -1 +1 @@
|
|||||||
f1bcd6da5db5c14c571b96bc7f6556becbbd6f80
|
bc9455fc4548025ad6b04132fe603be994881bf5
|
@ -1 +1 @@
|
|||||||
0d95327e76d56a0637d3108f653071f01a578b4e
|
af59ae54387248745eca273c902da7d5c6ac89b3
|
@ -1 +1 @@
|
|||||||
21d6d8d438c0a77044b1e75cede4bd770f75db7c
|
f88b88d951436b1e14bed4dcb22cfe4db6e2442b
|
Binary file not shown.
@ -1 +1 @@
|
|||||||
ecd6582948e78b7d730ff1cbedb7ac5d9243a0f7
|
cbd9be16315bc40b8db406a77350bfe852e7b7bf
|
@ -1 +1 @@
|
|||||||
eaacc1c7b4091afc9f745a3c5eec0b42ac4234ca
|
b1bc4d43ea4ede8b853e03b765143c78266363be
|
@ -1 +1 @@
|
|||||||
a75bd866047dfc7ad973477648e8acaa2b56cb42
|
92053bb2a1f1686d30cfc60c050ca7e342d2794d
|
@ -1 +1 @@
|
|||||||
3385d9b9c1d52e3bdc2a9625fb90960591639907
|
a082b9b028531e4197a6c2cb943bc48f36ec63e9
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user