diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-11-18 16:00:51 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-11-18 16:00:51 +0100 |
| commit | 01bf07008b38839f4e1dff3293f921c2e35a44c4 (patch) | |
| tree | 6a3c333f988433593a74327cab8493ad23f210f0 | |
| parent | 23f336b105dc96641e9ac1042fa0ec11a3617fc1 (diff) | |
| parent | f199b78f265d2f4d9671e48d6afef20a68c5b8c7 (diff) | |
| download | otp-01bf07008b38839f4e1dff3293f921c2e35a44c4.tar.gz otp-01bf07008b38839f4e1dff3293f921c2e35a44c4.tar.bz2 otp-01bf07008b38839f4e1dff3293f921c2e35a44c4.zip | |
Merge branch 'ia/public_key/ssl/git-ignore'
* ia/public_key/ssl/git-ignore:
Updated public_key and ssl ignores
| -rw-r--r-- | .gitignore | 18 | ||||
| -rw-r--r-- | lib/public_key/.gitignore | 7 |
2 files changed, 7 insertions, 18 deletions
diff --git a/.gitignore b/.gitignore index e6920fbeca..065c499708 100644 --- a/.gitignore +++ b/.gitignore @@ -86,9 +86,6 @@ lib/os_mon/priv/obj/win32/ lib/runtime_tools/c_src/win32/ lib/runtime_tools/priv/lib/ lib/runtime_tools/priv/obj/ -lib/ssl/c_src/win32/ -lib/ssl/priv/bin/win32/ -lib/ssl/priv/obj/win32/ lib/tools/bin/win32/ lib/tools/c_src/win32/ lib/tools/obj/win32/ @@ -287,13 +284,6 @@ JAVADOC-GENERATED /lib/os_mon/mibs/v1/OTP*.mib.v1 /lib/os_mon/priv/mibs/OTP*.bin -# public_key - -/lib/public_key/asn1/*.asn1db -/lib/public_key/asn1/*.erl -/lib/public_key/asn1/*.hrl -/lib/public_key/include/OTP-PUB-KEY.hrl - # ssh /lib/ssh/src/*.asn1db @@ -302,14 +292,6 @@ JAVADOC-GENERATED /lib/ssh/src/PKCS-1.erl /lib/ssh/src/PKCS-1.hrl -# ssl - -/lib/ssl/pkix/*.asn1db -/lib/ssl/include/OTP-PKIX.hrl -/lib/ssl/pkix/OTP-PKIX.erl -/lib/ssl/pkix/OTP-PKIX.hrl -/lib/ssl/pkix/ssl_pkix_oid.erl - # stdlib /lib/stdlib/src/erl_parse.erl diff --git a/lib/public_key/.gitignore b/lib/public_key/.gitignore new file mode 100644 index 0000000000..db24906676 --- /dev/null +++ b/lib/public_key/.gitignore @@ -0,0 +1,7 @@ +# public_key + +/lib/public_key/asn1/*.asn1db +/lib/public_key/asn1/*.erl +/lib/public_key/asn1/*.hrl +/lib/public_key/include/OTP-PUB-KEY.hrl +/lib/public_key/include/PKCS-FRAME.hrl |