diff options
| author | Adam Cozzette <acozzette@gmail.com> | 2017-05-01 10:58:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-01 10:58:38 -0700 |
| commit | 2f4489a3e504e0a4aaffee69b551c6acc9e08374 (patch) | |
| tree | 4cd6e883d0d92f39ebbaa0f6b4bf0f321a165df0 /.gitignore | |
| parent | 286f0598422a70639e587b5329bd3037f5ee76b0 (diff) | |
| parent | 9053033a5076f82cf18b823c31f352e95e5bfd8d (diff) | |
| download | protobuf-2f4489a3e504e0a4aaffee69b551c6acc9e08374.tar.gz protobuf-2f4489a3e504e0a4aaffee69b551c6acc9e08374.tar.bz2 protobuf-2f4489a3e504e0a4aaffee69b551c6acc9e08374.zip | |
Merge pull request #3024 from acozzette/merge-3.3-to-master
Merged 3.3.x branch to master
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -65,6 +65,9 @@ src/js_embed src/protoc src/unittest_proto_middleman +# vim generated +*.swp + # Generated test scaffolding src/no_warning_test.cc src/no-warning-test |