diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2019-01-17 12:29:00 -0800 |
|---|---|---|
| committer | Joshua Haberman <jhaberman@gmail.com> | 2019-01-17 12:29:00 -0800 |
| commit | e13e1c46ae06a29ddebc9f1c2220d3a8544433dd (patch) | |
| tree | 75c52050242cc8e2e0cfbdc4897565e0961d33e8 /upb/upb.h | |
| parent | 01557462cc211cec9c7bddede77995b938067ea5 (diff) | |
| parent | e5ccbdcdd02fba915bdac60a290c824ca2e5ef53 (diff) | |
Merge branch 'arrayapi' into defcleanup
Diffstat (limited to 'upb/upb.h')
| -rw-r--r-- | upb/upb.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -419,6 +419,7 @@ typedef enum { typedef enum { UPB_WELLKNOWN_UNSPECIFIED, UPB_WELLKNOWN_ANY, + UPB_WELLKNOWN_FIELDMASK, UPB_WELLKNOWN_DURATION, UPB_WELLKNOWN_TIMESTAMP, /* number wrappers */ |