diff options
| author | Anders Svensson <[email protected]> | 2011-08-24 16:54:49 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2011-08-24 16:54:49 +0200 |
| commit | d48eaa0731017e5cdadca0af77ac14cd949b6c67 (patch) | |
| tree | 844f32bd3b624cca3e2bdc8a6142dfb435bfcfac /erts/.gitignore | |
| parent | f7250e531db57154f77d1e37d7a317d1bd18b616 (diff) | |
| parent | 6448312a3d25fa4f212d58dbdf0474f3c9014165 (diff) | |
| download | otp-d48eaa0731017e5cdadca0af77ac14cd949b6c67.tar.gz otp-d48eaa0731017e5cdadca0af77ac14cd949b6c67.tar.bz2 otp-d48eaa0731017e5cdadca0af77ac14cd949b6c67.zip | |
Merge branch 'anders/diameter/augment_inherited_enums/OTP-9469' into dev
* anders/diameter/augment_inherited_enums/OTP-9469:
Allow @enum when AVP is defined in an inherited dictionary.
Diffstat (limited to 'erts/.gitignore')
0 files changed, 0 insertions, 0 deletions