diff options
author | Dan Gudmundsson <[email protected]> | 2010-09-02 15:25:14 +0200 |
---|---|---|
committer | Dan Gudmundsson <[email protected]> | 2010-09-02 15:25:14 +0200 |
commit | f0c4e27ef0a5a365cab7b1dc69dbecf7856c3f3f (patch) | |
tree | 8e5727c1244f0f8a227e2c9a70fc37fdeac65783 /.gitignore | |
parent | 68b47f68edadf2bbea608e37bdd2c426180c2d99 (diff) | |
parent | 9ed56d8518cfb33c9163be8e9de42ca8bc6979cb (diff) | |
download | otp-f0c4e27ef0a5a365cab7b1dc69dbecf7856c3f3f.tar.gz otp-f0c4e27ef0a5a365cab7b1dc69dbecf7856c3f3f.tar.bz2 otp-f0c4e27ef0a5a365cab7b1dc69dbecf7856c3f3f.zip |
Merge branch 'dgud/ssl-commit-example-certs' into dev
* dgud/ssl-commit-example-certs:
Cleanup ssl configure parts
Remove cert building from Makefiles
Checkin example certs instead of generating them.
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 71c7b9b33d..6034a21f87 100644 --- a/.gitignore +++ b/.gitignore @@ -191,6 +191,11 @@ a.out.dSYM/ /lib/kernel/src/inet_dns_record_adts.hrl +# kernel + +/lib/mnesia/test/Mnesia.* +/lib/mnesia/test/test_log* + # otp_mibs /lib/otp_mibs/include/[A-Z]*.hrl @@ -221,9 +226,6 @@ a.out.dSYM/ # ssl /lib/ssl/pkix/*.asn1db -/lib/ssl/examples/certs/done -/lib/ssl/examples/certs/ebin/make_certs.beam -/lib/ssl/examples/certs/etc/ /lib/ssl/include/OTP-PKIX.hrl /lib/ssl/pkix/OTP-PKIX.erl /lib/ssl/pkix/OTP-PKIX.hrl |