aboutsummaryrefslogtreecommitdiffstats
path: root/lib/et
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2010-09-01 10:12:59 +0200
committerBjörn Gustavsson <[email protected]>2010-09-01 10:32:51 +0200
commitd10b3698655328fc19a34fb6c7d37319547dc945 (patch)
tree77c2d66726ac0869bc22f5249cd551728bfb9fe0 /lib/et
parent8537e5489707c8961c1a6f045f635b7a064f811c (diff)
parent96db19557ac894cffcaa18e8f1191d387a5b05ea (diff)
downloadotp-d10b3698655328fc19a34fb6c7d37319547dc945.tar.gz
otp-d10b3698655328fc19a34fb6c7d37319547dc945.tar.bz2
otp-d10b3698655328fc19a34fb6c7d37319547dc945.zip
Merge branch 'maint-r13' into dev
* maint-r13: asn1 tests: Remove duplicated SUITE data directories Update of vsn.mk, relnotes and appup for patch in R13B04 track Add support for Extension addition group Conflicts: lib/asn1/test/Makefile lib/asn1/test/asn1_SUITE.erl.src lib/asn1/vsn.mk OTP-8598
Diffstat (limited to 'lib/et')
0 files changed, 0 insertions, 0 deletions