Merge branch 'release' into dev
This commit is contained in:
commit
701e5af5a2
|
|
@ -42,6 +42,7 @@
|
||||||
"win7-x64": { },
|
"win7-x64": { },
|
||||||
"win7-x86": { },
|
"win7-x86": { },
|
||||||
"osx.10.10-x64": { },
|
"osx.10.10-x64": { },
|
||||||
"ubuntu.14.04-x64": { }
|
"ubuntu.14.04-x64": { },
|
||||||
|
"ubuntu.15.04-x64": { }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue