diff options
| author | Jie Luo <anandolee@gmail.com> | 2015-05-13 15:24:42 -0700 |
|---|---|---|
| committer | Jie Luo <anandolee@gmail.com> | 2015-05-13 15:24:42 -0700 |
| commit | 2d9b1c592ff7319ee9d6520c9df4838087522e05 (patch) | |
| tree | 6eec7e633840b5b60cc85e20f6365df0702e6911 /ruby/.gitignore | |
| parent | 8a888922a9ac181a3fb47d00d497cde85ec4987a (diff) | |
| parent | 38da6583b1416a7c1594bffec3cdbb8856a72353 (diff) | |
| download | protobuf-2d9b1c592ff7319ee9d6520c9df4838087522e05.tar.gz protobuf-2d9b1c592ff7319ee9d6520c9df4838087522e05.tar.bz2 protobuf-2d9b1c592ff7319ee9d6520c9df4838087522e05.zip | |
Merge pull request #382 from jtattermusch/integrate_from_master
Integrate changes from latest master branch into csharp branch.
Diffstat (limited to 'ruby/.gitignore')
| -rw-r--r-- | ruby/.gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ruby/.gitignore b/ruby/.gitignore index 80c978f2..bd8745dd 100644 --- a/ruby/.gitignore +++ b/ruby/.gitignore @@ -4,3 +4,5 @@ tags lib/google/protobuf_java.jar protobuf-jruby.iml target/ +pkg/ +tmp/ |