protobuf - Protocol Buffers - Google's data interchange format

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove redundant `the` in comments.	Dongjoon Hyun	2016-02-03	2	-2/+2
\|
*	Restore the license for Internal.java	Jisi Liu	2016-01-29	1	-1/+29
\|
*	Uncomment the test, which was commented out during integration	Jisi Liu	2016-01-29	1	-185/+184
\|
*	Integrate from google internal.	Jisi Liu	2016-01-29	139	-0/+55893
\| \| \| \| \|	Java files are moved to un-do the hack in the prevous commit, which moved the java files to the original position for integration.
*	Undo the Java module change for integration.	Jisi Liu	2016-01-28	140	-55972/+0
\| \| \| \| \| \| \| \| \|	Moving the files to their original location, so that opensource changes can be picked during the internal merge. Those files will be moved into the correct location after merging with internal code. Note: do NOT merge this into master without the other internal down-integration commit.
*	move test file (was in wrong place after rebasing on java module refactor)	Joshua Humphries	2016-01-15	1	-0/+211
\|
*	throw IOException instead of InvalidProtocolBufferException when appropriate	Joshua Humphries	2016-01-15	3	-4/+80
\|
*	Restructuring protobuf to multiple modules	nmittler	2016-01-13	142	-0/+55866
	protobuf/java will become a parent pom that will contain two modules: core - contains all of the code for the protobuf-java artifact util - contains all of the code for the protobuf-java-util artifact Also cleaned up various Maven warnings.