aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | |/ | | |/|
| * | | Merge pull request #601 from anandolee/masterJie Luo2015-07-172-0/+35
| |\ \ \ | | |_|/ | |/| |
| | * | ignore UTF-8 BOM if it is in the begining of a proto fileJie Luo2015-07-162-0/+35
| | |/
| * / Install missing headersRob Earhart2015-07-141-0/+3
| |/
* | Merge pull request #628 from jtattermusch/csharp_addressbook_updateJan Tattermusch2015-07-205-47/+47
|\ \
| * | update addressbook exampleJan Tattermusch2015-07-203-6/+6
| * | regenerate Addressbook.csJan Tattermusch2015-07-201-39/+39
| * | update addressbook.protoJan Tattermusch2015-07-201-2/+2
|/ /
* | Merge pull request #624 from jskeet/wkt-jsonJan Tattermusch2015-07-203-1/+80
|\ \
| * | First part of JSON formatting for well-known types. I think we need a reflect...Jon Skeet2015-07-203-1/+80
|/ /
* | Merge pull request #620 from google/jtattermusch-patch-2Jon Skeet2015-07-171-1/+1
|\ \
| * | Fix typo in buildall.shJan Tattermusch2015-07-171-1/+1
|/ /
* | Merge pull request #616 from jskeet/renameJan Tattermusch2015-07-17101-142/+135
|\ \
| * | Updated csharp_EXTRA_DIST for TravisJon Skeet2015-07-171-89/+90
| * | First pass at the big rename from ProtocolBuffers to Google.Protobuf.Jon Skeet2015-07-17100-53/+45
|/ /
* | Merge pull request #611 from jskeet/csharp-wrappersJon Skeet2015-07-1724-129/+3516
|\ \
| * | Fixes from PR review.Jon Skeet2015-07-174-15/+89
| * | Make the map test actually test the code...Jon Skeet2015-07-161-0/+7
| * | First pass at wrapper types.Jon Skeet2015-07-1615-475/+927
| * | Fixes to ByteString's equality handling.Jon Skeet2015-07-162-20/+41
| * | First part of implementing wrapper types. Not ready yet!Jon Skeet2015-07-1613-20/+2853
* | | Merge pull request #586 from jtattermusch/csharp_names_exportJan Tattermusch2015-07-167-5/+84
|\ \ \
| * | | export c# naming routines publiclyJan Tattermusch2015-07-107-5/+84
* | | | Merge pull request #612 from jtattermusch/csharp_distcheck_fixJie Luo2015-07-161-248/+106
|\ \ \ \
| * | | | updated csharp_EXTRA_DISTJan Tattermusch2015-07-161-248/+106
| | |/ / | |/| |
* | | | Merge pull request #607 from jtattermusch/csharp_appveyorJan Tattermusch2015-07-162-7/+34
|\ \ \ \ | |/ / / |/| | |
| * | | add C# build and tests to appveyorJan Tattermusch2015-07-152-7/+34
* | | | Merge pull request #610 from jskeet/fix-enumeratorJon Skeet2015-07-162-63/+6
|\ \ \ \
| * | | | Remove the struct-based iterator for RepeatedField.Jon Skeet2015-07-162-63/+6
|/ / / /