Max Cai
|
1274ae6cf2
am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."
|
12 سال پیش |
Ulas Kirazci
|
5b799a26e3
am dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage"
|
12 سال پیش |
Ulas Kirazci
|
34d6051064
am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option."
|
12 سال پیش |
Wink Saville
|
2e58634a11
am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function"
|
12 سال پیش |
Ulas Kirazci
|
d8e4681030
am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."
|
12 سال پیش |
Ulas Kirazci
|
9865277597
am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option."
|
12 سال پیش |
Ulas Kirazci
|
80e4a3466f
am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."
|
12 سال پیش |
Ulas Kirazci
|
1eb488bc32
am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4"
|
12 سال پیش |
Ulas Kirazci
|
1724ed4d4e
am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."
|
12 سال پیش |
Adam Metcalf
|
51d87cc588
am 380d1b5a: Fix the merge conflict leftovers.
|
12 سال پیش |
Wink Saville
|
5486adb7d2
am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc
|
12 سال پیش |
Wink Saville
|
fb594ee1ec
am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
|
12 سال پیش |
Wink Saville
|
990a4753dc
am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
|
12 سال پیش |
Wink Saville
|
5534cede6e
am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
|
12 سال پیش |
Wink Saville
|
5a2be75cb2
am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
|
12 سال پیش |
xiaofeng@google.com
|
e7f2937962
Fix a bug in Arm64 atomicops. (https://codereview.appspot.com/88800045/)
|
12 سال پیش |
Ying Wang
|
e251c9eb81
am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"
|
12 سال پیش |
Ying Wang
|
efd4ae404f
am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"
|
12 سال پیش |
Ying Wang
|
70ef74aaa6
am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"
|
12 سال پیش |
Ying Wang
|
b54018a23c
Merge "You CANNOT change the global WITH_DEXPREOPT"
|
12 سال پیش |
Ying Wang
|
d75027090c
You CANNOT change the global WITH_DEXPREOPT
|
12 سال پیش |
Jan-Willem Maarse
|
42470ba6e0
am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"
|
12 سال پیش |
Jan-Willem Maarse
|
00120917a1
am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"
|
12 سال پیش |
Jan-Willem Maarse
|
3e46c9b5da
am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"
|
12 سال پیش |
Jan-Willem Maarse
|
4aecb2b6d5
Merge "Fix NPE when clearing an extension in nano protos"
|
12 سال پیش |
Jan-Willem Maarse
|
b24fdd476f
Fix NPE when clearing an extension in nano protos
|
12 سال پیش |
Bill Yi
|
05b6a7be8a
am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD
|
12 سال پیش |
Bill Yi
|
12214c58ec
am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD
|
12 سال پیش |
Bill Yi
|
af802cd274
Merge commit 'ba89934bdae7f4256c94a0a24992903a114e764f' into HEAD
|
12 سال پیش |
Jeff Davidson
|
46bf9261af
resolved conflicts for merge of 592b6078 to master
|
12 سال پیش |