diff options
| author | Mike Morris <michael.patrick.morris@gmail.com> | 2014-10-27 12:15:45 -0400 |
|---|---|---|
| committer | Mike Morris <michael.patrick.morris@gmail.com> | 2014-10-27 12:15:45 -0400 |
| commit | d89c5f0e1920a455b095208d6b60a64262e83ac3 (patch) | |
| tree | 25b014afbe36c3c8ca046194c59b4627053c408f /.travis.yml | |
| parent | f01d88cdba1a4025b821741402d4681111ba2f82 (diff) | |
| parent | af9f317c251a0a1adfeaad8dd983ab602cf93070 (diff) | |
| download | qtlocation-mapboxgl-d89c5f0e1920a455b095208d6b60a64262e83ac3.tar.gz | |
Merge branch 'master' into mesa
Conflicts:
.travis.yml
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 66423f4efd..f09282a9c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,10 +19,9 @@ matrix: env: global: - - secure: "HPlPuLk531F7bCyADMcxQ+I1CfGhJlhX9A3q3auNCdLsjqaZbktaCIGuq4R1IPZz0UTtO8RfrTfVaoktyZdq2QyU3iD8oj6BeZ/Jypr4TCBJxI5IeyU3gyPMFHqUYIJuHL9k40Xu7Dhf4HT123zr8KoeVqCHauZP1/TumA0nezg=" - - secure: "R/+uOeccl7GqjJbknailAV7VtjAtGwHHM9xToVnhfPVUXp9fzJs+oNk3IWcs3Eg4sw4WsYxXRfbCQG9bA3MnPlTOsxETGRioO9CAuXap6mwcwNAzeWuq7ePFki2u01pJGQD5b6WFqBCdnAQ4o2SgHgGzhs0TJzYd9tONQxSmkCI=" + - secure: "bG4YYWMfl9API0MSRgmOaJrlGLv06tRg9KJNawBieZvBJbITPpxVGJZT3/l/SEJ+Rl15e2dRex4k+MGQlmT2SqPQxTEYWv1qxNigKPPcla7IWeNmWWqW8uVvFjdglojgBOK2k/xErVQtA4zDfi3mwSXH4DKwquXWsoEKmX2SV7M=" + - secure: "Cbvap9ubVKgjPe3hUhI6JGeDZzBXHpOG9RaYKh+SdoIPhKnlJiNOYm1egomi+e4uqJInlFKuVHTw7Ng9Cun6Zm0jIxpkSchv1GpsR7hmB3UGnGed19Dw8121FwuUaktN+4YnbVlsyd+u8EHD3+h58t4eELrLrZolM4rS7DL6caA=" - secure: "RiBIBfVhhaMjU5ksuwJO3shdvG9FpinBjdSv4co9jg9171SR8edNriedHjVKSIeBhSGNmZmX+twS3dJS/By6tl/LKh9sTynA+ZAYYljkE7jn881B/gMrlYvdAA6og5KvkhV1/0iJWlhuZrMTkhpDR200iLgg3EWBhWjltzmDW/I=" - - AWS_S3_BUCKET: 'node-mapbox-gl-native' - LD_LIBRARY_PATH: '/usr/local/lib' before_install: |