aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Lindberg <[email protected]>2012-01-12 15:50:10 +0100
committerAdam Lindberg <[email protected]>2012-01-12 15:50:10 +0100
commitecdf20f68d21c53efacf8668108f750c5e765d74 (patch)
tree263c57992dc40e5b5dedcf1125db8908b59c43f9
parentaf92f5b223cc2c55df388ba731f017692e238a41 (diff)
parentbbb5c1d98873587e379160945452a0c1e53e210d (diff)
downloadotp-ecdf20f68d21c53efacf8668108f750c5e765d74.tar.gz
otp-ecdf20f68d21c53efacf8668108f750c5e765d74.tar.bz2
otp-ecdf20f68d21c53efacf8668108f750c5e765d74.zip
Merge branch 'maint'
-rw-r--r--lib/public_key/.gitignore10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/public_key/.gitignore b/lib/public_key/.gitignore
index db24906676..d30fe62c9d 100644
--- a/lib/public_key/.gitignore
+++ b/lib/public_key/.gitignore
@@ -1,7 +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
+asn1/*.asn1db
+asn1/*.erl
+asn1/*.hrl
+include/OTP-PUB-KEY.hrl
+include/PKCS-FRAME.hrl