aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Fix compatiblity issues.Feng Xiao2016-07-141-0/+68
* Add missing golden test file.Feng Xiao2016-07-141-0/+1
* Add missing LIBPROTOBUF_EXPORTFeng Xiao2016-07-131-4/+4
* Add missing LIBPROTOBUF_EXPORT.Feng Xiao2016-07-131-3/+4
* Update generated files.Feng Xiao2016-07-1312-256/+457
* Integrate from internal code base.Feng Xiao2016-07-1336-213/+719
* Merge pull request #1735 from jskeet/attribute-placementJon Skeet2016-07-0713-41/+64
|\
| * Remove WriteGeneratedTypeAttributes which is a no-opJon Skeet2016-07-075-13/+2
| * Move DebuggerNonUserCodeAttribute to function membersJon Skeet2016-07-0413-39/+73
* | Make sure also Solaris x86 gets PATH_MAXDagobert Michelsen2016-07-071-2/+0
* | Merge pull request #1753 from xfxyjwf/fixupJisi Liu2016-07-072-10/+2
|\ \
| * | Fix data member declaration order.Feng Xiao2016-07-061-2/+2
| * | Don't support global ::string in stringpiece.hFeng Xiao2016-07-061-8/+0
| |/
* | Fix spelling error in function ParseTime parameterOtto Kekäläinen2016-07-031-1/+1
* | Fix spelling in strings and commentsOtto Kekäläinen2016-07-0325-26/+26
|/
* Merge pull request #1704 from lizan/json_parse_optionsFeng Xiao2016-07-018-32/+214
|\
| * Add JsonParseOptions to ignore unknown fieldsLizan Zhou2016-06-288-32/+214
* | Fix some failing travis tests.Feng Xiao2016-07-011-0/+1
* | Fix windows build.Feng Xiao2016-06-302-7/+14
* | Integrated internal changes from GoogleAdam Cozzette2016-06-29128-1318/+4351
|/
* Merge pull request #1696 from haberman/jswktJoshua Haberman2016-06-171-3/+11
|\
| * Bugfix: base the require logic on the file being required.Josh Haberman2016-06-161-4/+4
| * JS: import well-known types from google-protobuf package.Josh Haberman2016-06-161-0/+8
* | Add new generation option for using proto sources from other frameworks.Thomas Van Lenten2016-06-174-127/+325
* | Address review comments on function namevjpai2016-06-161-2/+2
* | Remove a friend-class template that is only used for theVijay Pai2016-06-151-4/+7
|/
* Add support for generation sources into a framework.Thomas Van Lenten2016-06-154-8/+39
* proper codeblock in READMEBrent Shaffer2016-06-091-1/+1
* Merge pull request #879 from mathstuf/support-equals-in-proto-pathFeng Xiao2016-06-082-2/+22
|\
| * protoc: support '=' in --proto_path argumentsBen Boeckel2016-04-202-2/+22
* | Add GOOGLE_ prefix before PROTOBUF_DEPRECATED_ATTRBo Yang2016-06-073-3/+3
* | Fix the undefined behavior for opensource users.Bo Yang2016-06-071-3/+5
* | Add more warnings to for the ObjC runtime buildThomas Van Lenten2016-05-253-2/+45
* | Better support for using the proto library from a framework.Thomas Van Lenten2016-05-244-48/+199
* | Merge pull request #1549 from xyzzyz/arena_exportJoshua Haberman2016-05-181-1/+1
|\ \
| * | Export class Arena to shared library.Adam Michalik2016-05-171-1/+1
* | | Merge pull request #1547 from xyzzyz/js_generatorJoshua Haberman2016-05-181-1/+1
|\ \ \
| * | | Fix #include in js_generator.ccAdam Michalik2016-05-171-1/+1
| |/ /
* / / Integrate interanl changesBo Yang2016-05-182-1/+2
|/ /
* | Merge pull request #1542 from google/beta-3Jisi Liu2016-05-163-9/+60
|\ \
| * | Remove the comments about iterator validationJisi Liu2016-05-131-3/+1
| * | Merge pull request #1520 from pherl/hashmapvs2008Jisi Liu2016-05-121-3/+55
| |\ \
| | * | Bridge vs2008 hashmaps.Jisi Liu2016-05-111-3/+55
| * | | Fix the command line interface unittest againJisi Liu2016-05-101-3/+4
| |/ /
* | | Merge pull request #1483 from wal-rus/fix-boost-incompatibilityFeng Xiao2016-05-111-3/+1
|\ \ \ | |/ / |/| |
| * | Remove confounding and unused #define - breaks boost/predef/other/endian.hWalter Gray2016-05-061-3/+1
* | | Merge pull request #1499 from beardedN5rd/masterFeng Xiao2016-05-061-1/+4
|\ \ \
| * | | after comment of Feng Xiao changed the entry to g++beardedn5rd2016-05-061-2/+2
| * | | updated READMEbeardedn5rd2016-05-061-1/+4
| |/ /
* | | Updated README.mdMahmut Ali ÖZKURAN2016-05-061-1/+1
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-29 02:39:49 +0000