aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge pull request #1409 from eeight/fix_enum_corruptionFeng Xiao2016-05-043-2/+50
|\ \ | |/ |/|
| * Fix bug with silent message corruption in LITE_RUNTIME.Petr Prokhorenkov2016-04-213-2/+50
* | Merge branch 'master' of github.com:google/protobufJisi Liu2016-04-2811-4/+839
|\ \
| * | Proper checking of enum with non zero defaultThomas Van Lenten2016-04-261-4/+5
| * | Merge pull request #1416 from cwhipkey/masterFeng Xiao2016-04-208-29/+739
| |\ \
| | * | Change protobuf CPP proto generator to support the 'lite' option inChad Whipkey2016-04-158-29/+739
| | |/
* | / Down integrate from Google internal.Jisi Liu2016-04-28105-1225/+2343
|/ /
* | Merge pull request #1414 from xyzzyz/googletestFeng Xiao2016-04-201-1/+0
|\ \
| * | Remove googletest.h header from stringprintf.ccAdam Michalik2016-04-141-1/+0
* | | Merge pull request #1401 from jskeet/enum-casingJon Skeet2016-04-207-7/+152
|\ \ \
| * | | Attempt to fix AppVeyor build by exporting GetEnumValueNameJon Skeet2016-04-202-1/+9
| * | | Add C# codegen changes to enum value names (mostly C++)Jon Skeet2016-04-206-6/+141
| * | | Use 0 as the default value for all enums, rather than finding the actual enum...Jon Skeet2016-04-111-1/+3
* | | | Add missing includes in field mask testJisi Liu2016-04-191-0/+2
| |_|/ |/| |
* | | Merge pull request #1397 from google/internal-mergeJoshua Haberman2016-04-11145-1427/+5132
|\ \ \ | |/ / |/| |
| * | Removed duplicated operator delete from merge conflict.Josh Haberman2016-04-071-6/+0
| * | Merge branch 'master' into internal-mergeJosh Haberman2016-04-0737-113/+303
| |\ \
| * \ \ Merge branch 'master' of github.com:google/protobufJisi Liu2016-04-011-1/+1
| |\ \ \
| * | | | Do not use C++11 unicode escape in unittest.Jisi Liu2016-04-011-1/+1
| * | | | Do not let windows.h define min/max macrosJisi Liu2016-04-011-0/+1
| * | | | Fix re-definition issue of winsock.h and winsock2.hJisi Liu2016-03-311-0/+1
| * | | | Fix WIN32 build for map_test.Jisi Liu2016-03-311-0/+6
| * | | | Remove export macros for classes nested in a template class.Jisi Liu2016-03-311-3/+3
| * | | | Fix javanano packageJisi Liu2016-03-311-0/+3
| * | | | Fix breakage of referring to table_ in static funcJisi Liu2016-03-311-1/+1
| * | | | Temporarily disable begin is fast test.Jisi Liu2016-03-311-1/+2
| * | | | Merge branch 'master' of github.com:google/protobufJisi Liu2016-03-3020-319/+485
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Integrate google internal changes.Jisi Liu2016-03-30145-1440/+5155
* | | | | Fix to csharp_options - initialize internal_access to false.Jon Skeet2016-04-081-1/+2
* | | | | Merge pull request #1393 from gvaish/masterJon Skeet2016-04-073-1/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Added support for internal_access for C#Gaurav Vaish2016-04-073-1/+6
* | | | | Merge pull request #1392 from anandolee/masterJie Luo2016-04-078-19/+41
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | sync the Manually integrate changes in google3/third_partyJie Luo2016-04-068-19/+41