[git] GPGME - branch, passphrase-inquire, created. gpgme-1.5.5-10-gaa89252

[by Ben Kibbey]

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 "GnuPG Made Easy".

The branch, passphrase-inquire has been created
        at  aa89252256fc87d637d3793a1fabdbee207967a4 (commit)

- Log -----------------------------------------------------------------
commit aa89252256fc87d637d3793a1fabdbee207967a4
Merge: 2fe9ffe e07d38f
Author: Ben Kibbey <bjk at luxsci.net>
Date:   Fri Aug 14 20:56:14 2015 -0400

    Merge branch 'master' into passphrase-inquire

diff --cc src/gpgme.def
index ab1f643,cf167b4..a3f5fb4
--- a/src/gpgme.def
+++ b/src/gpgme.def
@@@ -218,7 -218,7 +218,10 @@@ EXPORT
      gpgme_op_spawn_start                  @163
      gpgme_op_spawn                        @164
  
-     gpgme_set_status_cb                   @165
-     gpgme_get_status_cb                   @166
+     gpgme_set_offline                     @165
+     gpgme_get_offline                     @166
++
++    gpgme_set_status_cb                   @167
++    gpgme_get_status_cb                   @168
  ; END
  
diff --cc src/libgpgme.vers
index decfc8a,fc2920f..6687571
--- a/src/libgpgme.vers
+++ b/src/libgpgme.vers
@@@ -93,8 -93,8 +93,11 @@@ GPGME_1.1 
      gpgme_op_spawn_start;
      gpgme_op_spawn;
  
+     gpgme_set_offline;
+     gpgme_get_offline;
++
 +    gpgme_set_status_cb;
 +    gpgme_get_status_cb;
  };
  
  

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


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org