diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2017-02-13 17:03:55 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-13 17:03:55 -0800 |
commit | d2dfe46b2789dfe155559508c3f567a746a50616 (patch) | |
tree | bd65c80d738c1d91965de4dcf8352f6056a43984 /java | |
parent | 3f6f73b796988f47bfc157d3a9faee81fad7fa89 (diff) | |
parent | e41b667da50d582ac8e38cfea4af4e78261f2ad3 (diff) | |
download | protobuf-d2dfe46b2789dfe155559508c3f567a746a50616.tar.gz protobuf-d2dfe46b2789dfe155559508c3f567a746a50616.tar.bz2 protobuf-d2dfe46b2789dfe155559508c3f567a746a50616.zip |
Merge pull request #2609 from yixiang/patch-1
Undef TYPE_BOOL to avoid conflict with iOS.
Diffstat (limited to 'java')
0 files changed, 0 insertions, 0 deletions