Merge branch 'release' into dev

This commit is contained in:
Ryan Brandenburg 2016-04-28 16:58:39 -07:00
commit 7ac6ea9caf
1 changed files with 1 additions and 0 deletions

View File

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