Max Cai
|
31e0909c49
am 438ca4a8: am f1c5cd09: am be303d03: am d734d52f: am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements."
|
11 лет назад |
Max Cai
|
09592e05e9
am 17395e55: am e668f0c3: am 2693b3aa: am 92d0bd25: am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option."
|
11 лет назад |
Max Cai
|
c032a15817
am 826b4cf5: am 74b536a5: am a84e8aa6: am fc9db907: am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this"
|
11 лет назад |
Max Cai
|
15167d6f58
am 3c4cfdab: am 80fe1808: am c45fb6a2: am 6988e26b: am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style."
|
11 лет назад |
Max Cai
|
789d9b94e9
am 03016e74: am 2cb17b18: am b2a7fc6b: am f97b9ced: am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics."
|
11 лет назад |
Max Cai
|
dfa03c1f20
am fa0eb541: am bd188bc7: am ab8cc071: am e4bf716d: am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields."
|
11 лет назад |
Max Cai
|
b4948d7e03
am eaac3e7b: am 4734b989: am aa2afb08: am caf35105: am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge
|
11 лет назад |
Max Cai
|
106ab9f855
am a61b2ef1: am e9056405: am 6ed6b682: am f593c0a5: am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."
|
11 лет назад |
Ulas Kirazci
|
6173389c74
am 056670c9: am e655a862: am f7bbfdfd: am 4dfa34e2: am dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage"
|
11 лет назад |
Ulas Kirazci
|
6172b92ec9
am 73789372: am 8d2f4cf7: am ea95349d: am 90e065dd: am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option."
|
11 лет назад |
Wink Saville
|
72d1e4c1de
am 8973d9e6: am c6ec950e: am b624b3aa: am 554bd957: am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function"
|
11 лет назад |
Ulas Kirazci
|
7d207bb141
am d8fbc188: am b42d5107: am a6ddccbb: am e9a0bb71: am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."
|
11 лет назад |
Ulas Kirazci
|
4adac19858
am 8877603f: am 2b2d73d2: am a8b4f97f: am 2b9bfa3d: am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option."
|
11 лет назад |
Ulas Kirazci
|
e984f5ac1b
am dde8a694: am a19dbf97: am 6d1e9709: am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."
|
11 лет назад |
Ulas Kirazci
|
e1368404c2
am 54ad71fb: am e6780389: am 998ea484: am 194529f1: am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4"
|
11 лет назад |
Ulas Kirazci
|
c76c4672f6
am 242aa182: am 5a9d43b2: am ede9a1f5: am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."
|
11 лет назад |
Adam Metcalf
|
4d0809c712
am cd22086d: am c0bc136b: am 67f3f6aa: am 4104f751: am 380d1b5a: Fix the merge conflict leftovers.
|
11 лет назад |
Wink Saville
|
628e245da3
am aa2e7e5f: am 3a2460f3: am f3bf0583: am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc
|
11 лет назад |
Wink Saville
|
64b1c7780b
am ed67cd79: am d801ea90: am 2fb1789c: am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
|
11 лет назад |
Wink Saville
|
bf6b7cb8f7
am 1c524da8: am 9f4f73e2: am 50ddd7ad: am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
|
11 лет назад |
Wink Saville
|
07c34fa29b
am 3c00157e: am 02cba9f2: am 05f45faa: am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
|
11 лет назад |
Wink Saville
|
052abeef0c
am a94fe6cb: am 7a8797ab: am 77140fb2: am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
|
11 лет назад |
Ying Wang
|
0f91148556
am b09fd32d: am f25e1e6b: am 165d4d7e: am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"
|
11 лет назад |
jieluo@google.com
|
786379af47
patch Issue 130740043 to trunk for other atomicops patches: [MIPS64] Add support for MIPS64 in protobuf
|
11 лет назад |
Wink Saville
|
5cf6a25ac8
am 232698c4: am de6420aa: am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
|
11 лет назад |
Wink Saville
|
681a96ff0e
am 0cb1a2f6: am c8f69926: am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9"
|
11 лет назад |
Max Cai
|
fe0c21e262
am 67584f49: am 9de52973: am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul."
|
11 лет назад |
Max Cai
|
a51cbaf3bf
am 1b9cb7b2: am 0eaea6a8: am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f
|
11 лет назад |
Jie Dai
|
ea45d54168
am 1af058a5: am 0ce2c261: am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp
|
11 лет назад |
Max Cai
|
38113673ef
am 5843426a: am 0c063c66: am fa7bf363: am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options."
|
11 лет назад |