diff options
| author | Björn Gustavsson <[email protected]> | 2013-02-07 13:15:15 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2013-02-07 13:15:15 +0100 |
| commit | f7eed05cb052fd479efaa7607118bf74b523ec33 (patch) | |
| tree | 72b8ec5e4ae350b52fb58c75613b0d19ab7611e7 /lib/tools/Makefile | |
| parent | 2ec63b31743a177446884ed12736607d3fbea1ef (diff) | |
| parent | d45c6b727da8db7664d2cc08a16ef8ca68fe46df (diff) | |
| download | otp-f7eed05cb052fd479efaa7607118bf74b523ec33.tar.gz otp-f7eed05cb052fd479efaa7607118bf74b523ec33.tar.bz2 otp-f7eed05cb052fd479efaa7607118bf74b523ec33.zip | |
Merge branch 'maint'
* maint:
Prepare release
Don't run testX420/1 on old slow Sparc systems
testX420: Pass Options to the ASN.1 compiler
asn1_erl_nif: Correct broken length encoding
asn1_SUITE: Mend broken test_modified_x420/1
Revert "Prepare release"
Conflicts:
lib/asn1/doc/src/notes.xml
lib/asn1/test/asn1_SUITE.erl
Diffstat (limited to 'lib/tools/Makefile')
0 files changed, 0 insertions, 0 deletions