protobuf - Protocol Buffers – Google’s data interchange format

	Commit message (Collapse)	Author	Age
...
\| *	Down-integrate internal bug fixing changes.	Bo Yang	2015-10-04
\|/
*	Merge remote-tracking branch 'origin/master' into beta-1	Feng Xiao	2015-08-26
\|\
* \|	fix "memory leaks" in protostream-object files.	Jisi Liu	2015-08-25
\| \| \| \| \| \| \| \|	Change-Id: I0aca56802d974cb03cb89c1a294f37068b5b9758
* \|	Merge pull request #734 from TeBoring/beta-1	Feng Xiao	2015-08-25
\|\ \ \| \| \| \| \| \|	Fix bugs on windows
\| * \|	Fix bugs on windows	Bo Yang	2015-08-25
\| \| \|
* \| \|	Merge branch 'beta-1' of github.com:google/protobuf into manual-merge	Jisi Liu	2015-08-25
\|\\| \| \| \| \| \| \| \| \| \| \|	Change-Id: I83a93fdb119a643fbc884e6ec3624493f6270370
* \| \|	Merge branch 'gcc-c++11-fix' of https://github.com/nsuke/protobuf into beta-1	Jisi Liu	2015-08-25
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Manually merge pull request: https://github.com/google/protobuf/pull/674 that fixes the gcc C++11 build.
\| \| * \|	Down-integrate from google3.	Feng Xiao	2015-08-22
\| \|/ / \|/\| \|
* \| \|	Down-integrate from internal branch.	Jisi Liu	2015-08-21
\| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4
\| \| *	Fix map fields parsing.	Feng Xiao	2015-08-11
\| \|/ \|/\| \| \| \| \|	Change-Id: If61e16cea84492474a71bbfe985131ec980b0b0a
\| *	Fix gcc C++11 build	Nobuaki Sukegawa	2015-08-01
\|/
*	MinGW64+MSYS2 compilation issues and portable isnan using MathLimits	Karol Ostrovsky	2015-07-01
\|
*	fix compiler warnings.	Jisi Liu	2015-06-24
\| \| \| \| \| \| \|	- control reaches end of non-void function. - remove a deprecated IsMatch. Change-Id: Ifdeb15879bbcf591c48dc7fda1cd8994bdf87bb3
*	using ::isnan to avoid conflicts with std::isnan for C++11 build.	Jisi Liu	2015-06-18
\| \| \| \|	Change-Id: I057b44eff04c3b0062a4fd4307ce6e4ca1eb952b
*	Fix broken builds.	Feng Xiao	2015-06-17
\|
*	Down-integrate from internal code base.	Feng Xiao	2015-06-15
	[ci skip] Change-Id: I9391c09640e0b0b2b21c45a97a1fc91814d95c5d