summaryrefslogtreecommitdiff
path: root/source4/heimdal/lib/asn1/pkcs12.asn1
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-08-27 11:01:55 +1000
committerAndrew Bartlett <abartlet@samba.org>2008-08-27 11:01:55 +1000
commit8b94f7bcd70b1196487b433e355127a4f84bf5a5 (patch)
tree940c1838cd0fa4033fef7945e97b530341f99ecf /source4/heimdal/lib/asn1/pkcs12.asn1
parentca20c56b260e2799c40b0c7c0e3ef5f7308b586e (diff)
parent9430420ba246c26489ad51e8b52e13d891436bb3 (diff)
downloadsamba-8b94f7bcd70b1196487b433e355127a4f84bf5a5.tar.gz
samba-8b94f7bcd70b1196487b433e355127a4f84bf5a5.tar.bz2
samba-8b94f7bcd70b1196487b433e355127a4f84bf5a5.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into pac-verify
(This used to be commit 32143287c7eb452c6ed9ccd15e8cd4e5a907b437)
Diffstat (limited to 'source4/heimdal/lib/asn1/pkcs12.asn1')
-rw-r--r--source4/heimdal/lib/asn1/pkcs12.asn12
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/heimdal/lib/asn1/pkcs12.asn1 b/source4/heimdal/lib/asn1/pkcs12.asn1
index 37fe03e58e..4d6454a08f 100644
--- a/source4/heimdal/lib/asn1/pkcs12.asn1
+++ b/source4/heimdal/lib/asn1/pkcs12.asn1
@@ -1,4 +1,4 @@
--- $Id: pkcs12.asn1 15715 2005-07-23 11:08:47Z lha $ --
+-- $Id$ --
PKCS12 DEFINITIONS ::=