aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorBilly Robert O'Neal III <bion@microsoft.com>2020-03-12 14:40:01 -0700
committerBilly Robert O'Neal III <bion@microsoft.com>2020-03-12 14:40:01 -0700
commit5c36b48154e31f935cfbe856ad6c52ba892cdcb5 (patch)
tree05aad169f895f10b8c8780722dd02007ed616a74 /scripts
parent52214665b200f6ff66a77d0454708438fb60317e (diff)
parentc2795f1662b0cd3c801a7788cda042b4f3fdc1fe (diff)
downloadvcpkg-5c36b48154e31f935cfbe856ad6c52ba892cdcb5.tar.gz
vcpkg-5c36b48154e31f935cfbe856ad6c52ba892cdcb5.zip
Merge remote-tracking branch 'origin/master' into warning
Diffstat (limited to 'scripts')
-rw-r--r--scripts/ci.baseline.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index adfb92959..bffa4fd59 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1336,7 +1336,6 @@ osgearth:x64-osx=fail
osgearth:x64-linux=fail
osgearth:x64-windows-static=fail
osg-qt:x64-windows-static=fail
-osg-qt:x64-linux=fail
otl:x64-windows=ignore
otl:x64-windows-static=ignore
otl:x64-uwp=ignore