Merge branch 'rel/1.1.0' into dev

This commit is contained in:
Nate McMaster 2016-11-10 10:41:38 -08:00
commit 798767180b
No known key found for this signature in database
GPG Key ID: BD729980AA6A21BD
1 changed files with 1 additions and 0 deletions

View File

@ -30,6 +30,7 @@
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"osx.10.12-x64": {},
"ubuntu.14.04-x64": {},
"ubuntu.15.04-x64": {}
}