330 Commits (c1ebdc53be2b857e093c460d0b49f33712e03090)
 

Author SHA1 Message Date
Max Cai c1ebdc53be am d734d52f: am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements." 11 years ago
Max Cai a4d6044d4d am 92d0bd25: am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option." 11 years ago
Max Cai ca3ee371df am fc9db907: am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this" 11 years ago
Max Cai 407a507750 am 6988e26b: am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style." 11 years ago
Max Cai 5377fe8d63 am f97b9ced: am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics." 11 years ago
Max Cai a6d2dea6cb am e4bf716d: am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields." 11 years ago
Max Cai 92ee2f0ea8 am caf35105: am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge 11 years ago
Max Cai 4091687400 am f593c0a5: am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()." 11 years ago
Ulas Kirazci dbe4eda3b7 am 4dfa34e2: am dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage" 11 years ago
Ulas Kirazci 7a29ad789e am 90e065dd: am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option." 11 years ago
Wink Saville 9d4ef46006 am 554bd957: am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function" 11 years ago
Ulas Kirazci e7eb156549 am e9a0bb71: am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled." 11 years ago
Ulas Kirazci dee998a2ea am 2b9bfa3d: am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option." 11 years ago
Ulas Kirazci 4202251da0 am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields." 11 years ago
Ulas Kirazci 0d7bc44bdf am 194529f1: am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4" 11 years ago
Ulas Kirazci 991282903e am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano." 11 years ago
Adam Metcalf 3d365c953a am 4104f751: am 380d1b5a: Fix the merge conflict leftovers. 11 years ago
Wink Saville 1a4e9aadeb am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc 11 years ago
Wink Saville e478ddd511 am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto." 11 years ago
Wink Saville 648917d924 am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano." 11 years ago
Wink Saville 94d87e4398 am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto." 11 years ago
Wink Saville 583ccca8d5 am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano." 11 years ago
Max Cai aff0edcc22 am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements." 11 years ago
Max Cai 493ac5bb15 am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option." 11 years ago
Max Cai bd636aed71 am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this" 11 years ago
Max Cai 11e2bf3bc2 am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style." 11 years ago
Max Cai 525810e6d7 am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics." 11 years ago
Max Cai 751cfd0c52 am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields." 11 years ago
Max Cai 7da3e7591f am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge 11 years ago
Max Cai 1274ae6cf2 am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()." 11 years ago
Ulas Kirazci 5b799a26e3 am dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage" 11 years ago
Ulas Kirazci 34d6051064 am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option." 11 years ago
Wink Saville 2e58634a11 am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function" 11 years ago
Ulas Kirazci d8e4681030 am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled." 11 years ago
Ulas Kirazci 9865277597 am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option." 11 years ago
Ulas Kirazci 80e4a3466f am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields." 11 years ago
Ulas Kirazci 1eb488bc32 am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4" 11 years ago
Ulas Kirazci 1724ed4d4e am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano." 11 years ago
Adam Metcalf 51d87cc588 am 380d1b5a: Fix the merge conflict leftovers. 11 years ago
Wink Saville 5486adb7d2 am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc 11 years ago
Wink Saville fb594ee1ec am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto." 11 years ago
Wink Saville 990a4753dc am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano." 11 years ago
Wink Saville 5534cede6e am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto." 11 years ago
Wink Saville 5a2be75cb2 am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano." 11 years ago
Ying Wang e251c9eb81 am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT" 11 years ago
Ying Wang efd4ae404f am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT" 11 years ago
Ying Wang 70ef74aaa6 am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT" 11 years ago
Ying Wang b54018a23c Merge "You CANNOT change the global WITH_DEXPREOPT" 11 years ago
Ying Wang d75027090c You CANNOT change the global WITH_DEXPREOPT 11 years ago
Jan-Willem Maarse 42470ba6e0 am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos" 11 years ago