diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2018-12-08 13:45:12 +0100 |
|---|---|---|
| committer | Joshua Haberman <jhaberman@gmail.com> | 2018-12-08 13:45:12 +0100 |
| commit | bfa3c015bb8de950d0e6b0076be89df4bc37fba7 (patch) | |
| tree | 8f0571635334582029f76e22160ef051fe510c5d /upb/upb.h | |
| parent | 14c96a143c63a01c1080a23d9e1c0196d06f0e5e (diff) | |
| parent | 73ccf4a7c7d8a1a26d1258f44a37c1fc02f4b14b (diff) | |
Merge branch 'master' into defcleanup
Diffstat (limited to 'upb/upb.h')
| -rw-r--r-- | upb/upb.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -810,6 +810,7 @@ typedef enum { */ typedef enum { UPB_WELLKNOWN_UNSPECIFIED, + UPB_WELLKNOWN_ANY, UPB_WELLKNOWN_DURATION, UPB_WELLKNOWN_TIMESTAMP, /* number wrappers */ |