aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #659 from jskeet/fix-frozenJon Skeet2015-07-3021-327/+3
|\
| * Generated code from previous commit.Jon Skeet2015-07-3018-315/+0
| * More freezing tidy-up; generated code in next commit.Jon Skeet2015-07-302-5/+2
| * Minor bits of left-over frozenness.Jon Skeet2015-07-302-7/+1
|/
* Merge pull request #654 from jtattermusch/csharp_hide_freezeJon Skeet2015-07-3035-1498/+8
|\
| * regenerate codeJan Tattermusch2015-07-2918-1192/+0
| * remove the freeze APIJan Tattermusch2015-07-2917-306/+8
* | Merge pull request #655 from jtattermusch/csharp_expose_more_info_about_serviceJon Skeet2015-07-301-0/+10
|\ \ | |/ |/|
| * add IsClientStreaming and IsServerStreaming to MethodDescriptorJan Tattermusch2015-07-291-0/+10
|/
* Merge pull request #638 from jskeet/portableJan Tattermusch2015-07-2919-21/+457
|\
| * Update the readme file to indicate supported platformsJon Skeet2015-07-281-0/+11
| * Humbug - previous commit didn't include project file changes :(Jon Skeet2015-07-281-0/+2
| * Tweaks to Profile259 supportJon Skeet2015-07-286-11/+303
| * First attempt at using profile 259 for Google.Protobuf.Jon Skeet2015-07-2714-15/+146
|/
* Merge pull request #641 from jtattermusch/csharp_descriptor_databaseJon Skeet2015-07-252-4/+21
|\
| * expose original binary data for filedescriptorJan Tattermusch2015-07-242-4/+21
|/
* Merge pull request #634 from jskeet/reflection2Jon Skeet2015-07-239-199/+342
|\
| * Implemented Jan's suggestion of FieldCollection, replacing FieldAccessorColle...Jon Skeet2015-07-226-119/+128
| * Added newlinesJon Skeet2015-07-222-2/+2
| * First pass at making field access simpler.Jon Skeet2015-07-227-175/+309
|/
* Merge pull request #625 from jskeet/reflection-refactorJan Tattermusch2015-07-2248-1274/+772
|\
| * Fix typo in Makefile.amJon Skeet2015-07-221-1/+1
| * Fix attribute mistake and regenerate code.Jon Skeet2015-07-224-10/+0
| * Fix file lists for C#Jon Skeet2015-07-221-1/+1
| * Generated code for previous commit.Jon Skeet2015-07-2217-511/+129
| * Remove the usage of attributes for field/method discovery.Jon Skeet2015-07-2222-405/+243
| * Fix comment typoJon Skeet2015-07-211-1/+1
| * Generated code changes following previous commit.Jon Skeet2015-07-2118-728/+686
| * Revamp to reflection.Jon Skeet2015-07-2135-278/+372
|/
* Merge pull request #629 from google/masterJon Skeet2015-07-2136-2000/+2393
|\
| * Merge pull request #627 from jtattermusch/addressbook_proto3Jan Tattermusch2015-07-207-26/+26
| |\
| | * rename persons to peopleJan Tattermusch2015-07-207-8/+8
| | * use Google.Protobuf namespace for C#Jan Tattermusch2015-07-201-1/+1
| | * fixed java exampleJan Tattermusch2015-07-202-5/+5
| | * fix python exampleJan Tattermusch2015-07-202-5/+5
| | * fix C++ exampleJan Tattermusch2015-07-202-7/+7
| | * update addressbook.proto to proto3Jan Tattermusch2015-07-201-8/+8
| * | Merge pull request #621 from nico/staticassJisi Liu2015-07-201-2/+4
| |\ \ | | |/ | |/|
| | * Let GOOGLE_COMPILE_ASSERT use static_assert if available.Nico Weber2015-07-171-2/+4
| * | Merge pull request #604 from haberman/ruby-conformanceJoshua Haberman2015-07-2016-579/+694
| |\ \
| | * | Fixed lint errors and responded to CR comments.Josh Haberman2015-07-172-27/+30
| | * | Exclude JRuby from conformance tests for now.Josh Haberman2015-07-171-7/+16
| | * | Added Ruby to conformance tests.Josh Haberman2015-07-1616-575/+678
| * | | Merge pull request #622 from pherl/splitheadersJisi Liu2015-07-172-0/+2
| |\ \ \ | | |_|/ | |/| |
| | * | Addming missing includes in stubs headers.Jisi Liu2015-07-172-0/+2
| * | | Merge pull request #613 from pherl/splitheadersJisi Liu2015-07-1710-1404/+1640
| |\| |
| | * | update header list.Jisi Liu2015-07-171-0/+3
| | * | Merge branch 'master' of github.com:google/protobuf into splitheaderJisi Liu2015-07-171-0/+3
| | |\ \
| | * | | Update make file for extra headers.Jisi Liu2015-07-172-0/+12
| | * | | Split up common.h headersJisi Liu2015-07-168-1404/+1625
| | | |/ | | |/|