aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Expand)AuthorAge
* Add more warnings to for the ObjC runtime buildGravatar Thomas Van Lenten2016-05-25
* Better support for using the proto library from a framework.Gravatar Thomas Van Lenten2016-05-24
* Merge pull request #1549 from xyzzyz/arena_exportGravatar Joshua Haberman2016-05-18
|\
* \ Merge pull request #1547 from xyzzyz/js_generatorGravatar Joshua Haberman2016-05-18
|\ \
* | | Integrate interanl changesGravatar Bo Yang2016-05-18
| | * Export class Arena to shared library.Gravatar Adam Michalik2016-05-17
| |/ |/|
| * Fix #include in js_generator.ccGravatar Adam Michalik2016-05-17
|/
* Merge pull request #1542 from google/beta-3Gravatar Jisi Liu2016-05-16
|\
| * Remove the comments about iterator validationGravatar Jisi Liu2016-05-13
| * Merge pull request #1520 from pherl/hashmapvs2008Gravatar Jisi Liu2016-05-12
| |\
| | * Bridge vs2008 hashmaps.Gravatar Jisi Liu2016-05-11
* | | Merge pull request #1483 from wal-rus/fix-boost-incompatibilityGravatar Feng Xiao2016-05-11
|\ \ \ | |_|/ |/| |
| | * Fix the command line interface unittest againGravatar Jisi Liu2016-05-10
| |/ |/|
| * Remove confounding and unused #define - breaks boost/predef/other/endian.hGravatar Walter Gray2016-05-06
* | Merge pull request #1499 from beardedN5rd/masterGravatar Feng Xiao2016-05-06
|\ \
| * | after comment of Feng Xiao changed the entry to g++Gravatar beardedn5rd2016-05-06
| * | updated READMEGravatar beardedn5rd2016-05-06
| |/
* | Updated README.mdGravatar Mahmut Ali ÖZKURAN2016-05-06
* | Merge pull request #1409 from eeight/fix_enum_corruptionGravatar Feng Xiao2016-05-04
|\ \ | |/ |/|
* | Merge branch 'master' of github.com:google/protobufGravatar Jisi Liu2016-04-28
|\ \
* | | Down integrate from Google internal.Gravatar Jisi Liu2016-04-28
| * | Proper checking of enum with non zero defaultGravatar Thomas Van Lenten2016-04-26
| | * Fix bug with silent message corruption in LITE_RUNTIME.Gravatar Petr Prokhorenkov2016-04-21
| * | Merge pull request #1416 from cwhipkey/masterGravatar Feng Xiao2016-04-20
|/| |
* | | Merge pull request #1414 from xyzzyz/googletestGravatar Feng Xiao2016-04-20
|\ \ \
* \ \ \ Merge pull request #1401 from jskeet/enum-casingGravatar Jon Skeet2016-04-20
|\ \ \ \
| * | | | Attempt to fix AppVeyor build by exporting GetEnumValueNameGravatar Jon Skeet2016-04-20
| * | | | Add C# codegen changes to enum value names (mostly C++)Gravatar Jon Skeet2016-04-20
* | | | | Add missing includes in field mask testGravatar Jisi Liu2016-04-19
| |_|_|/ |/| | |
| | | * Change protobuf CPP proto generator to support the 'lite' option inGravatar Chad Whipkey2016-04-15
| |_|/ |/| |
| | * Remove googletest.h header from stringprintf.ccGravatar Adam Michalik2016-04-14
* | | Merge pull request #1397 from google/internal-mergeGravatar Joshua Haberman2016-04-11
|\ \ \
| | * | Use 0 as the default value for all enums, rather than finding the actual enum...Gravatar Jon Skeet2016-04-11
| |/ / |/| |
* | | Fix to csharp_options - initialize internal_access to false.Gravatar Jon Skeet2016-04-08
| * | Removed duplicated operator delete from merge conflict.Gravatar Josh Haberman2016-04-07
| * | Merge branch 'master' into internal-mergeGravatar Josh Haberman2016-04-07
| |\ \
* | \ \ Merge pull request #1393 from gvaish/masterGravatar Jon Skeet2016-04-07
|\ \ \ \ | |_|/ / |/| | |
* | | | Merge pull request #1392 from anandolee/masterGravatar Jie Luo2016-04-07
|\ \ \ \
| | * | | Added support for internal_access for C#Gravatar Gaurav Vaish2016-04-07
| |/ / / |/| | |
| * | | sync the Manually integrate changes in google3/third_partyGravatar Jie Luo2016-04-06
* | | | Add more documentation for csharp_options.hGravatar Jon Skeet2016-04-06
* | | | Line-wrapping changes only for C# generator codeGravatar Jon Skeet2016-04-06
* | | | Merge pull request #1349 from gvaish/masterGravatar Jon Skeet2016-04-05
|\ \ \ \
| * | | | Added access_level for typesGravatar Gaurav Vaish2016-04-05
* | | | | Added deprecated option handling for objective-c generatorGravatar Oleg Vereshko2016-04-04
|/ / / /
| | * | Merge branch 'master' of github.com:google/protobufGravatar Jisi Liu2016-04-01
| | |\ \ | |_|/ / |/| | |
| | * | Do not use C++11 unicode escape in unittest.Gravatar Jisi Liu2016-04-01
| | * | Do not let windows.h define min/max macrosGravatar Jisi Liu2016-04-01
| | * | Fix re-definition issue of winsock.h and winsock2.hGravatar Jisi Liu2016-03-31
| | * | Fix WIN32 build for map_test.Gravatar Jisi Liu2016-03-31