diff options
author | Kenneth Lundin <[email protected]> | 2010-09-10 12:09:00 +0200 |
---|---|---|
committer | Kenneth Lundin <[email protected]> | 2010-09-10 12:09:00 +0200 |
commit | 357860d3b5def55eba80523c0be83ee4ebcab12c (patch) | |
tree | ce7ecf49f15053bd9aafd460e6201a7d6d44e33a /lib/cosProperty/src/CosPropertyService_PropertySetDefFactory_impl.erl | |
parent | 1470138027905c4adfd87d805457a40b39c2bdc6 (diff) | |
parent | 210fbb984619e6a6bb1122b7a6f72f54fb72effb (diff) | |
download | otp-357860d3b5def55eba80523c0be83ee4ebcab12c.tar.gz otp-357860d3b5def55eba80523c0be83ee4ebcab12c.tar.bz2 otp-357860d3b5def55eba80523c0be83ee4ebcab12c.zip |
Merge branch 'kenneth/asn1/nested_extaddgroup/OTP-8797' into dev
* kenneth/asn1/nested_extaddgroup/OTP-8797:
Add support for ExtensionAdditionGroup notation in nested types as well
Conflicts:
lib/asn1/test/test_undecoded_rest.erl
Diffstat (limited to 'lib/cosProperty/src/CosPropertyService_PropertySetDefFactory_impl.erl')
0 files changed, 0 insertions, 0 deletions