diff options
| author |  vjpai <vpai@google.com> | 2015-11-02 09:22:10 -0800 |
|---|---|---|
| committer | vjpai <vpai@google.com> | 2015-11-02 09:22:10 -0800 |
| commit | 11537dc71c2ceabf0a1e7f999f6c0e97f90c9f24 (patch) | |
| tree | 988df3540106ca35309f2cfc8f91e14474e03564 /.gitignore | |
| parent | 72a633213815f19ac04b51331287e3f7b075dcc1 (diff) | |
| parent | 89ea0c78151b5bdc4c9236ae7100a7b97b32e499 (diff) | |
Merge remote-tracking branch 'upstream/master' into protosplit
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 5972f82dfc..40f4c4734c 100644 --- a/.gitignore +++ b/.gitignore @@ -46,6 +46,9 @@ portlog.txt *-gyp.mk out +# YCM config files +.ycm_extra_conf.py + # XCode build/ *.pbxuser |