[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_12_4-6-gf55dd6e

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=f55dd6e87063530422c6b1792b5b46fcfe98f841

The branch, gnutls_2_12_x has been updated
       via  f55dd6e87063530422c6b1792b5b46fcfe98f841 (commit)
      from  c8672dc009d27ff10eb4f43522a352fcf658d14d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f55dd6e87063530422c6b1792b5b46fcfe98f841
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat May 7 19:15:34 2011 +0200

    removed merge artifact

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

Summary of changes:
 lib/libgnutls.map |   34 ----------------------------------
 1 files changed, 0 insertions(+), 34 deletions(-)

diff --git a/lib/libgnutls.map b/lib/libgnutls.map
index 3306314..23a2d81 100644
--- a/lib/libgnutls.map
+++ b/lib/libgnutls.map
@@ -693,40 +693,6 @@ GNUTLS_2_12
        gnutls_x509_crq_verify;
 } GNUTLS_2_10;
 
-GNUTLS_3_0_0 {
-  global:
-       gnutls_x509_trust_list_verify_crt;
-       gnutls_x509_trust_list_add_crls;
-       gnutls_x509_trust_list_add_cas;
-       gnutls_x509_trust_list_init;
-       gnutls_x509_trust_list_deinit;
-       gnutls_x509_crl_list_import;
-       gnutls_x509_crl_list_import2;
-       gnutls_x509_crt_list_import2;
-       gnutls_cipher_tag;
-       gnutls_cipher_add_auth;
-       gnutls_dtls_set_timeouts;
-       gnutls_transport_set_pull_timeout_function;
-       gnutls_dtls_get_mtu;
-       gnutls_dtls_set_mtu;
-        gnutls_record_recv_seq;
-       gnutls_key_generate;
-       gnutls_dtls_cookie_verify;
-       gnutls_dtls_cookie_send;
-       gnutls_dtls_prestate_set;
-       gnutls_dtls_get_data_mtu;
-       gnutls_cipher_set_iv;
-       gnutls_pcert_deinit;
-       gnutls_pcert_import_x509;
-       gnutls_pcert_import_x509_raw;
-       gnutls_pcert_import_openpgp;
-       gnutls_pcert_import_openpgp_raw;
-       gnutls_pubkey_get_openpgp_key_id;
-       gnutls_certificate_set_retrieve_function2;
-       gnutls_x509_trust_list_get_issuer;
-} GNUTLS_2_12;
->>>>>>> 91e62ff... Added gnutls_x509_crq_verify().
-
 GNUTLS_PRIVATE {
   global:
     # Internal symbols needed by libgnutls-extra:


hooks/post-receive
-- 
GNU gnutls