Skip to content

Commit

Permalink
Merge gfx-rs#128
Browse files Browse the repository at this point in the history
128: Small updates r=kvark a=Coder-256

Enable Travis CI cache, disable [deprecated container-based builds](https://docs.travis-ci.com/user/reference/trusty/#container-based-infrastructure), and add `red.png` to `.gitignore` (output from `cargo run --example capture`).

Co-authored-by: Jacob Greenfield <jacob@jacobgreenfield.me>
  • Loading branch information
bors[bot] and Coder-256 authored Nov 22, 2019
2 parents a5921da + bb1acd9 commit a18b43b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,6 @@ Cargo.lock

# Other
.DS_Store

# Output from capture example
red.png
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: rust
sudo: false
cache: cargo
os:
- linux
- osx
Expand Down

0 comments on commit a18b43b

Please sign in to comment.