Skip to content

Commit

Permalink
Merge branch 'ia/public_key/ssl/git-ignore'
Browse files Browse the repository at this point in the history
* ia/public_key/ssl/git-ignore:
  Updated public_key and ssl ignores
  • Loading branch information
IngelaAndin committed Nov 18, 2011
2 parents 23f336b + f199b78 commit 01bf070
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 18 deletions.
18 changes: 0 additions & 18 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
7 changes: 7 additions & 0 deletions lib/public_key/.gitignore
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 01bf070

Please sign in to comment.