diff options
| author | Erlang/OTP <[email protected]> | 2013-04-15 14:06:49 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2013-04-15 14:06:49 +0200 |
| commit | bd970a5d790127bd46543b068cf74246e4dd4eb2 (patch) | |
| tree | 76c89f1eeb6044f6b9c949f8295f5a6170c7e779 /erts | |
| parent | 98bad864871eada14c948d27be9998bed36e2f50 (diff) | |
| parent | f7c7510b55efe6a1ab1133f47ec4c3b0371784e8 (diff) | |
| download | otp-bd970a5d790127bd46543b068cf74246e4dd4eb2.tar.gz otp-bd970a5d790127bd46543b068cf74246e4dd4eb2.tar.bz2 otp-bd970a5d790127bd46543b068cf74246e4dd4eb2.zip | |
Merge branch 'bjorn/asn1/fix-lost-extension-mark/OTP-10995' into maint-r15
* bjorn/asn1/fix-lost-extension-mark/OTP-10995:
Prevent loss of objects after the extension marker
Don't lose the extension mark for object set parameters
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions