aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorAdam Cozzette <acozzette@gmail.com>2017-04-04 09:31:14 -0700
committerGitHub <noreply@github.com>2017-04-04 09:31:14 -0700
commit37c7b766b39b5d86e6bb920d1664d91dcf8399e7 (patch)
tree5d669c6e7adc41dd40cddd81076e248c418faca2 /.gitignore
parentcc3fa2ec80d196e045ae05797799f079188106f3 (diff)
parent58373fa160368d825255b0103235b1b769520f14 (diff)
downloadprotobuf-37c7b766b39b5d86e6bb920d1664d91dcf8399e7.tar.gz
protobuf-37c7b766b39b5d86e6bb920d1664d91dcf8399e7.tar.bz2
protobuf-37c7b766b39b5d86e6bb920d1664d91dcf8399e7.zip
Merge pull request #2930 from anuraaga/dev_rag
Fix error message for int64 parse failure.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 5ff64aae..e83df5f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -84,6 +84,8 @@ src/**/*.trs
java/core/target
java/util/target
javanano/target
+java/.idea
+java/**/*.iml
# Windows native output.
cmake/build