protobuf - Protocol Buffers - Google's data interchange format

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #5109 from haberman/integrate	Joshua Haberman	2018-09-07	1	-12/+21
\|\ \| \| \| \|	Down-integrate from google3.
\| *	Down-integrate from google3.	Josh Haberman	2018-09-04	1	-12/+21
\| \|
* \|	Code fixes for the original unit test.	Brandon Cole	2018-08-30	1	-0/+5
\|/ \| \| \|	Credit goes to @mercret for the fix.
*	Down-integrate from google3.	Feng Xiao	2018-08-08	1	-22/+29
\|
*	Add "override" for overridden virtual functions	Khuzema Pithewan	2018-06-19	1	-8/+8
\| \| \| \| \| \|	Add "override" for overridden virtual functions. Please refer following issue for discussion on this. https://github.com/google/protobuf/issues/67
*	Integrated internal changes from Google	Adam Cozzette	2018-03-13	1	-4/+4
\|
*	Down-integrate from google3.	Feng Xiao	2017-03-29	1	-4/+7
\|
*	Integrate internal changes	Bo Yang	2016-10-10	1	-1/+61
\|
*	Merge pull request #1704 from lizan/json_parse_options	Feng Xiao	2016-07-01	1	-1/+6
\|\ \| \| \| \|	Add JsonParseOptions to ignore unknown fields
\| *	Add JsonParseOptions to ignore unknown fields	Lizan Zhou	2016-06-28	1	-1/+6
\| \| \| \| \| \| \| \| \| \|	- add JsonParseOptions for JsonToBinaryString allow unknown fields - rename current JsonOptions to JsonPrintOptions
* \|	Integrated internal changes from Google	Adam Cozzette	2016-06-29	1	-6/+6
\|/ \| \| \|	This includes all internal changes from around May 20 to now.
*	Down integrate from Google internal.	Jisi Liu	2016-04-28	1	-3/+8
\|
*	Integrate google internal changes.	Jisi Liu	2016-03-30	1	-1/+24
\|
*	Down-integrate from internal code base.	Feng Xiao	2015-12-11	1	-249/+69
\|
*	Fix compilation errors when built internally.	Feng Xiao	2015-11-02	1	-1/+1
\| \| \| \| \| \| \| \|	1. mathlimits.h must be included before the inclusion of cmath (which gtest/gtest.h seems to include). 2. hash function for StringPiece doesn't work. Change-Id: I358a25d941a25b10b39fe76780eda41557699811
*	Down-integrate from google internal.	Jisi Liu	2015-10-05	1	-0/+20
\|
*	fix "memory leaks" in protostream-object files.	Jisi Liu	2015-08-25	1	-1/+3
\| \| \| \|	Change-Id: I0aca56802d974cb03cb89c1a294f37068b5b9758
*	Down-integrate from google3.	Feng Xiao	2015-08-22	1	-13/+28
\|
*	Fix broken builds.	Feng Xiao	2015-06-17	1	-7/+7
\|
*	Down-integrate from internal code base.	Feng Xiao	2015-06-15	1	-0/+455
	[ci skip] Change-Id: I9391c09640e0b0b2b21c45a97a1fc91814d95c5d