summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-01-22 10:53:14 +1100
committerAndrew Bartlett <abartlet@samba.org>2008-01-22 10:53:14 +1100
commit11061499e182b9c41ec793d4eefb8a2cf7c88bfe (patch)
treefa08fcbf21143655eb85ba79c6169b3b2eb24fdd /.gitignore
parent27b3c24040b1a7aa88413c477a3769bcd6847d72 (diff)
parent24efc9fc36194d379838eb9911b65e93535da19b (diff)
downloadsamba-11061499e182b9c41ec793d4eefb8a2cf7c88bfe.tar.gz
samba-11061499e182b9c41ec793d4eefb8a2cf7c88bfe.tar.bz2
samba-11061499e182b9c41ec793d4eefb8a2cf7c88bfe.zip
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
(This used to be commit 74220ca244865f97825cabdbc8aa899e71c25c7d)
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index ccc12650c1..9ed0334ea1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,6 +67,7 @@ source/lib/util/pidfile.h
source/lib/util/unix_privs.h
source/lib/util/util_proto.h
source/lib/util/wrap_xattr.h
+source/lib/util/asn1_proto.h
source/libcli/finddcs.h
source/libcli/libcli_proto.h
source/libcli/auth/proto.h
@@ -79,7 +80,6 @@ source/libcli/resolve/proto.h
source/libcli/security/proto.h
source/libcli/smb2/smb2_proto.h
source/libcli/smb_composite/proto.h
-source/libcli/util/asn1_proto.h
source/libcli/util/clilsa.h
source/libcli/util/proto.h
source/libcli/wrepl/winsrepl_proto.h