318 Commits (4d0081b352e1c457671ad5f84df8e7ecc704df2e)

Author SHA1 Message Date
Adam Cozzette d64a2d9941 Integrated internal changes from Google 9 years ago
Jisi Liu 5dea2017db Update version numbers for other languages 9 years ago
Jisi Liu cf14183bcd Down integrate from Google internal. 9 years ago
Jisi Liu 3b3c8abb96 Integrate google internal changes. 9 years ago
Pradeep Gollakota 4d98369f6d Allow custom URLs for Any in JsonFormat 9 years ago
Jisi Liu 5221dcbe47 Integrate from google internal. 9 years ago
Jisi Liu cb3f428810 Undo the Java module change for integration. 9 years ago
nmittler 49efe9d7db Restructuring protobuf to multiple modules 9 years ago
Feng Xiao 7d075a44c1 Update version number and fix javadoc errors. 9 years ago
Feng Xiao af81dcfc2c Fix Java travis tests. 9 years ago
Feng Xiao a0cecfd31a Make conformance tests build for C++ and Java. 9 years ago
Feng Xiao 13e1279d86 Remove internal options from proto files. 9 years ago
Feng Xiao e841bac4fc Down-integrate from internal code base. 9 years ago
Jisi Liu 479a90b4dd Revert unwanted changes. 9 years ago
Jisi Liu 46e8ff63cb Down-integrate from google internal. 9 years ago
Feng Xiao ffe9215140 Update version number. 9 years ago
Feng Xiao fbb3ef28c9 Merge Java util package to github. 9 years ago