Skip to content

Commit 86a5218

Browse files
authored
Merge pull request protocolbuffers#14 from Esri/marc9905/anno318_protobuf_update_3_11_b
Marc9905/anno318 protobuf update 3 11 b
2 parents 7c8e1f1 + 158d04b commit 86a5218

File tree

611 files changed

+85631
-48536
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

611 files changed

+85631
-48536
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
11
---
22
name: Bug report
33
about: Create a report to help us improve
4+
title: ''
5+
labels: ''
6+
assignees: ''
47

58
---
69

10+
<!--
11+
12+
NOTE: this form is for bug reports only. For questions or troubleshooting, please see the protobuf mailing list: https://groups.google.com/forum/#!forum/protobuf
13+
14+
-->
15+
716
**What version of protobuf and what language are you using?**
817
Version: master/v3.6.0/v3.5.0 etc.
918
Language: C++/Java/Python/C#/Ruby/PHP/Objective-C/Javascript

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
11
---
22
name: Feature request
33
about: Suggest an idea for this project
4+
title: ''
5+
labels: ''
6+
assignees: ''
47

58
---
69

10+
<!--
11+
12+
NOTE: this form is for feature requests (including cleanup requests) only. For questions or troubleshooting, please see the protobuf mailing list: https://groups.google.com/forum/#!forum/protobuf
13+
14+
-->
15+
16+
717
**What language does this apply to?**
818
If it's a proto syntax change, is it for proto2 or proto3?
919
If it's about generated code change, what programming language?

.github/ISSUE_TEMPLATE/question.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ conformance/Conformance.pbobjc.h
117117
conformance/Conformance.pbobjc.m
118118
conformance/conformance_pb.js
119119
conformance/conformance_pb.rb
120+
conformance/core
120121
conformance/failing_tests.txt
121122
conformance/google/
122123
conformance/google-protobuf/
@@ -138,6 +139,8 @@ composer.lock
138139
php/tests/generated/
139140
php/tests/old_protoc
140141
php/tests/protobuf/
142+
php/tests/core
143+
php/tests/vgcore*
141144
php/ext/google/protobuf/.libs/
142145
php/ext/google/protobuf/Makefile.fragments
143146
php/ext/google/protobuf/Makefile.global
@@ -197,6 +200,9 @@ cmake/cmake-build-debug/
197200
# Visual Studio 2017
198201
.vs
199202

203+
# Visual Studio Code
204+
/.vscode/
205+
200206
# IntelliJ
201207
.idea
202208
*.iml

0 commit comments

Comments
 (0)