[git] GpgOL - branch, master, updated. gpgol-2.3.0-23-g1cefdea

[by Andre Heinecke]

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 extension for MS Outlook".

The branch, master has been updated
       via  1cefdea05092b68a3db0c6eaa32341c3123f9f37 (commit)
       via  2da40322c2614a3357eac901f970c96cb1c17dbe (commit)
       via  907943aec81b5216ab678adf080e4656fcc5cd6a (commit)
       via  84fed74d4b44e177ae250aec9c49293481ddf5c0 (commit)
       via  fd901436fbf9f08630ee4e6ce38d1e7958ec1a6e (commit)
       via  8d140cb78c797c83ea882f34d11514cd8965386d (commit)
       via  7ac02373ee79b94f27d56573252947f1291a65a5 (commit)
       via  f36a658429d71c8abdb4176bdc543179093a1406 (commit)
       via  4b84e078d28ec572b9181009867d3c0555dee50c (commit)
       via  5853c8e2fb99acd9355cf6d8f274a476984bc1fa (commit)
       via  3db0bc6fb9474e0a746d99b63fca1613538feb04 (commit)
       via  aec234ee13ba6d4fd4f8c3f54e4cf6d0984bac72 (commit)
      from  8fb3524262283c77a91f7e6c615d97f426455332 (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 1cefdea05092b68a3db0c6eaa32341c3123f9f37
Merge: 8fb3524 2da4032
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Sep 6 17:35:22 2018 +0200

    Merge branch 'STABLE-BRANCH-2-3'
    
    --
     Conflicts:
    	src/common.h
    	src/mail.cpp
    	src/windowmessages.cpp


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

Summary of changes:
 src/common.h             |  1 +
 src/mail.cpp             |  4 +++-
 src/mailitem-events.cpp  | 24 +++++++++++++++---------
 src/parsecontroller.cpp  |  3 ++-
 src/ribbon-callbacks.cpp |  7 +++++++
 src/windowmessages.cpp   | 16 +++++++++++++---
 6 files changed, 41 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
GnuPG extension for MS Outlook
http://git.gnupg.org