protobuf - Protocol Buffers - Google's data interchange format

	Commit message (Expand)	Author	Age	Files	Lines
*	Modified NPM package to make all dependencies dev dependencies.package-json	Josh Haberman	2016-04-13	1	-4/+4
*	Merge pull request #1397 from google/internal-merge	Joshua Haberman	2016-04-11	273	-4795/+34425
\|\
\| *	Fix for gulpfile.js.	Josh Haberman	2016-04-11	1	-1/+10
\| *	Removed duplicated operator delete from merge conflict.	Josh Haberman	2016-04-07	1	-6/+0
\| *	Merge branch 'master' into internal-merge	Josh Haberman	2016-04-07	42	-124/+371
\| \|\
\| * \|	Fix for CommonJS tests.	Josh Haberman	2016-04-07	2	-8/+30
\| * \|	Merge pull request #1381 from pherl/internal-merge	Jisi Liu	2016-04-01	270	-4796/+34417
\| \|\ \
\| \| * \|	Merge branch 'master' into internal-merge	Jisi Liu	2016-04-01	270	-4796/+34417
\| \|/\| \|
\| \| * \|	Merge branch 'master' of github.com:google/protobuf	Jisi Liu	2016-04-01	12	-106/+218
\| \| \|\ \ \| \| \|/ / \| \|/\| \|
\| \| * \|	Do not use C++11 unicode escape in unittest.	Jisi Liu	2016-04-01	1	-1/+1
\| \| * \|	Do not let windows.h define min/max macros	Jisi Liu	2016-04-01	1	-0/+1
\| \| * \|	Allow bigobj for map_unittest	Jisi Liu	2016-04-01	1	-0/+2
\| \| * \|	Fix re-definition issue of winsock.h and winsock2.h	Jisi Liu	2016-03-31	1	-0/+1
\| \| * \|	Disable sign-compare warning.	Jisi Liu	2016-03-31	1	-1/+3
\| \| * \|	Fix signed-compare warning.	Jisi Liu	2016-03-31	1	-1/+1
\| \| * \|	revert unexpected change for py26	Jisi Liu	2016-03-31	1	-1/+4
\| \| * \|	Fix WIN32 build for map_test.	Jisi Liu	2016-03-31	1	-0/+6
\| \| * \|	Remove export macros for classes nested in a template class.	Jisi Liu	2016-03-31	1	-3/+3
\| \| * \|	Fix javanano package	Jisi Liu	2016-03-31	1	-0/+3
\| \| * \|	Fix json_format.py in py26	Jisi Liu	2016-03-31	1	-2/+4
\| \| * \|	Fix breakage of referring to table_ in static func	Jisi Liu	2016-03-31	1	-1/+1
\| \| * \|	Temporarily disable begin is fast test.	Jisi Liu	2016-03-31	1	-1/+2
\| \| * \|	Merge branch 'master' of github.com:google/protobuf	Jisi Liu	2016-03-30	114	-6935/+4729
\| \| \|\ \
\| \| * \| \|	Integrate google internal changes.	Jisi Liu	2016-03-30	269	-4802/+34402
* \| \| \| \|	Merge pull request #1400 from jskeet/fix-internal	Jan Tattermusch	2016-04-10	1	-1/+2
\|\ \ \ \ \
\| * \| \| \| \|	Fix to csharp_options - initialize internal_access to false.	Jon Skeet	2016-04-08	1	-1/+2
\|/ / / / /
* \| \| \| \|	Merge pull request #1393 from gvaish/master	Jon Skeet	2016-04-07	3	-1/+6
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	Added support for internal_access for C#	Gaurav Vaish	2016-04-07	3	-1/+6
* \| \| \| \|	Merge pull request #1392 from anandolee/master	Jie Luo	2016-04-07	8	-19/+41
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	sync the Manually integrate changes in google3/third_party	Jie Luo	2016-04-06	8	-19/+41
* \| \| \| \|	Merge pull request #1390 from jskeet/tidy-up	Jon Skeet	2016-04-07	21	-49/+111
\|\ \ \ \ \
\| * \| \| \| \|	Add more documentation for csharp_options.h	Jon Skeet	2016-04-06	2	-6/+18
\| * \| \| \| \|	Line-wrapping changes only for C# generator code	Jon Skeet	2016-04-06	20	-44/+94
* \| \| \| \| \|	Merge pull request #1391 from thomasvl/string_tweaks	Thomas Van Lenten	2016-04-06	2	-9/+47
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Error during parsing for invalid UTF-8 instead of dropping dropping data.	Thomas Van Lenten	2016-04-05	2	-9/+9
\| * \| \| \| \| \|	Add tests to ensure we read strings with BOMs so we don't forget about lesson...	Thomas Van Lenten	2016-04-05	1	-0/+38
\| \|/ / / / /
* / / / / /	Updating Xcode Settings to use iOS 9.3	Geoffrey Wiseman	2016-04-06	1	-0/+8
\|/ / / / /
* \| \| \| \|	Merge pull request #1349 from gvaish/master	Jon Skeet	2016-04-05	32	-84/+177
\|\ \ \ \ \
\| * \| \| \| \|	Added access_level for types	Gaurav Vaish	2016-04-05	32	-84/+177
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #1386 from andrewharp/patch-2	Feng Xiao	2016-04-05	1	-2/+12
\|\ \ \ \ \
\| * \| \| \| \|	Update BUILD	Andrew Harp	2016-04-04	1	-1/+1
\| * \| \| \| \|	Do not link in pthread library for Android builds.	Andrew Harp	2016-04-04	1	-2/+12
\|/ / / / /
* \| \| \| \|	Merge pull request #852 from qzix/master	Thomas Van Lenten	2016-04-04	5	-11/+41
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Added deprecated option handling for objective-c generator	Oleg Vereshko	2016-04-04	5	-11/+41
* \| \| \| \|	Merge pull request #1353 from keveman/master	Joshua Haberman	2016-04-01	2	-17/+30
\|\ \ \ \ \
\| * \| \| \| \|	Linking the cpp implementation extension statically with libprotobuf	Manjunath Kudlur	2016-04-01	2	-17/+30
* \| \| \| \| \|	Merge pull request #1377 from jskeet/remove-duplicate-tests	Jon Skeet	2016-04-01	2	-2/+0
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Remove duplicate test cases.	Jon Skeet	2016-04-01	2	-2/+0
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #1378 from thomasvl/manual_stream_parsing_helpers	Thomas Van Lenten	2016-04-01	2	-0/+17
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Add -position and -isAtEnd for use when manually parsing input streams.	Thomas Van Lenten	2016-04-01	2	-0/+17
\|/ / / / /