diff options
| author | bors-servo <metajack+bors@gmail.com> | 2014-11-25 10:01:32 -0700 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2014-11-25 10:01:32 -0700 |
| commit | b5d6864de1000d6d54c2d5ebfd90ea9f6a596c54 (patch) | |
| tree | b3f85c67cff460db2fb44968c37dfa572c9dfaef | |
| parent | 7b72ffcbafe6c526f6bf27aee71842b94f62a858 (diff) | |
| parent | 99e83583056e2f0a4ae524a6f29d468f9644c6a6 (diff) | |
| download | servo-b5d6864de1000d6d54c2d5ebfd90ea9f6a596c54.tar.gz servo-b5d6864de1000d6d54c2d5ebfd90ea9f6a596c54.zip | |
auto merge of #4099 : SimonSapin/servo/cargo-config, r=mbrubeck
This allows using `.cargo/config` at the root of the repository for local path override, without risk of accidentally committing it.
However I don’t have the environment to test the Android build. Would this break it?
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | ports/android/.cargo/config (renamed from .cargo/config) | 0 |
2 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index e679f107cf4..023ae02368b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +/.cargo/config /target /rust /cargo diff --git a/.cargo/config b/ports/android/.cargo/config index c441f661b36..c441f661b36 100644 --- a/.cargo/config +++ b/ports/android/.cargo/config |