diff options
| author | Björn Gustavsson <[email protected]> | 2010-10-08 12:09:21 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2010-10-08 12:09:21 +0200 |
| commit | af2bc4ea8ec8e7694bcfd923ce0db161ea7f908c (patch) | |
| tree | c5b062405ac4074d8ea6549cbec08c4a2c5fa95d /erts/etc/common/Makefile.in | |
| parent | 3ffb56672f9b51c5e1080c53b62a3e60983dfdfc (diff) | |
| parent | ffb54d7428a15e44da8f7c1649c73d677f4462f3 (diff) | |
| download | otp-af2bc4ea8ec8e7694bcfd923ce0db161ea7f908c.tar.gz otp-af2bc4ea8ec8e7694bcfd923ce0db161ea7f908c.tar.bz2 otp-af2bc4ea8ec8e7694bcfd923ce0db161ea7f908c.zip | |
Merge branch 'maint-r13' into maint-r14
* maint-r13:
Prepare release
Add additional test to cover this correction
correct the encoding of ExtensionAdditionGroup
temp
Add support for ExtensionAdditionGroup notation in nested types as well
Add test suites for (most) CORBA applications
Prepare release
An empty element declared as simpleContent was not properly validated.
Conflicts:
lib/asn1/doc/src/notes.xml
lib/asn1/test/asn1_SUITE.erl.src
lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl
lib/asn1/test/test_undecoded_rest.erl
lib/asn1/vsn.mk
lib/xmerl/doc/src/notes.xml
lib/xmerl/vsn.mk
Diffstat (limited to 'erts/etc/common/Makefile.in')
0 files changed, 0 insertions, 0 deletions