[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  8757bf83775afe10cb18d15943248a75bcc6a24b (commit)
      from  4dc1aa0436fdb8af50960db676b739c8ef81f38c (commit)


- Log -----------------------------------------------------------------
commit 8757bf83775afe10cb18d15943248a75bcc6a24b
Author: Matt Caswell <matt at openssl.org>
Date:   Fri May 22 09:28:43 2015 +0100

    Ignore files from other branches
    
    There are a number of files that are created on other branches that are
    not held in git and are not needed in master. When checking out master
    after working on another branch these files show up in "git status", so
    just add them to .gitignore
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 .gitignore | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/.gitignore b/.gitignore
index 77f8d21..1ac7f75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -109,3 +109,29 @@ ms/nt.mak
 ms/ntdll.mak
 ms/ssleay32.def
 ms/version32.rc
+
+# Files created on other branches that are not held in git, and are not
+# needed on this branch
+include/openssl/asn1_mac.h
+include/openssl/des_old.h
+include/openssl/fips.h
+include/openssl/fips_rand.h
+include/openssl/krb5_asn.h
+include/openssl/kssl.h
+include/openssl/pq_compat.h
+include/openssl/ssl23.h
+include/openssl/tmdiff.h
+include/openssl/ui_compat.h
+test/fips_aesavs.c
+test/fips_desmovs.c
+test/fips_dsatest.c
+test/fips_dssvs.c
+test/fips_hmactest.c
+test/fips_randtest.c
+test/fips_rngvs.c
+test/fips_rsagtest.c
+test/fips_rsastest.c
+test/fips_rsavtest.c
+test/fips_shatest.c
+test/fips_test_suite.c
+test/shatest.c