The branch, master has been updated
       via  e4679172e3f4307b14f0e1715dc33ca640dc038b (commit)
      from  be10e8eee6fa443244536fd76110b3863c505cca (commit)

- Log -----------------------------------------------------------------
commit e4679172e3f4307b14f0e1715dc33ca640dc038b
Author: Thomas Adam <tho...@xteddy.org>
Commit: Thomas Adam <tho...@xteddy.org>

    Sanitise additional .mailmap entries
    
    This sanitises multiple author addresses some more, mapping them back to one
    common entity.
---
 .mailmap |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/.mailmap b/.mailmap
index d834464..a7a401f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -9,6 +9,8 @@ Matthias Kilian         <k...@openbsd.org> kili <kili>
 Matthieu Herrb                 <matth...@openbsd.org> matthieu <matthieu>
 Miod Vallat            <m...@openbsd.org> miod <miod>
 Nicholas Marriott      <n...@openbsd.org> nicm <nicm>
+Nicholas Marriott      <n...@openbsd.org> no_author <no_aut...@example.org>
+<n...@openbsd.org>     <nicholas.marri...@gmail.com>
 Okan Demirmen          <o...@openbsd.org> okan <okan>
 Philip Guenther                <guent...@openbsd.org> guenther <guenther>
 Pierre-Yves Ritschard  <p...@openbsd.org> pyr <pyr>
@@ -18,4 +20,5 @@ Stefan Sperling       <s...@openbsd.org> stsp <stsp>
 Stuart Henderson       <st...@openbsd.org> sthen <sthen>
 Ted Unangst            <t...@openbsd.org> tedu <tedu>
 Theo Deraadt           <dera...@openbsd.org> deraadt <deraadt>
+Thomas Adam            <tho...@xteddy.org> Thomas <tho...@xteddy.org>
 William Yodlowsky      <will...@openbsd.org> william <william>


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

Summary of changes:
 .mailmap |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
tmux

------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_nov
_______________________________________________
tmux-cvs mailing list
tmux-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-cvs

Reply via email to