aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2013-10-03 11:44:49 -0400
committerScott González <scott.gonzalez@gmail.com>2013-10-03 11:44:56 -0400
commitacf153e0b45ee333b1ea99842494c839462686a4 (patch)
tree8fe952256a2026f65832e90e8da9b6d691a1d27d /.mailmap
parentb67d1037a8583b11658d1ecfc96e7971b0c7fcee (diff)
downloadjquery-ui-acf153e0b45ee333b1ea99842494c839462686a4.tar.gz
jquery-ui-acf153e0b45ee333b1ea99842494c839462686a4.zip
Updated author information.
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap10
1 files changed, 8 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index e88315efc..acd2f1ed6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -5,8 +5,8 @@ Alexander Polomoshnov <alex.polomoshnov@gmail.com>
Aliaksandr Rahalevich <saksmlz@gmail.com>
Andrew Couch <andy@couchand.com> <acouch@bluewolf.com>
Andrew Newcomb <ext.github@preceptsoftware.co.uk>
-Andrew Powell <powella@gmail.com> <andrew@shellscape.org>
-Andrew Powell <powella@gmail.com> <andrew@shellcape.org>
+Andrew Powell <andrew@shellscape.org> <andrew@shellcape.org>
+Andrew Powell <andrew@shellscape.org> <powella@gmail.com>
Andrey Kapitcyn <ru.m157y@gmail.com>
Ben Hollis <bhollis@amazon.com> <ben@benhollis.net>
Benjamin Scott Boyle <benjamins.boyle@gmail.com>
@@ -17,6 +17,8 @@ Corey Frang <gnarf37@gmail.com> <gnarf@gnarf.net>
Courtland Allen <courtlandallen@gmail.com>
Dan Streetman <ddstreet@ieee.org>
Danny Trunk <dtrunk90@gmail.com> <dtrunk90@googlemail.com>
+David De Sloovere <david.desloovere@outlook.com> <david.desloovere@hotmail.com>
+David Murdoch <david@davidmurdoch.com> <musicisair@yahoo.com>
Diego Tres <diegotres@gmail.com>
Dominique Vincent <dominique.vincent@toitl.com>
Doug Blood <dougblood@gmail.com>
@@ -34,6 +36,7 @@ Filippo Cavallarin <filippo.cavallarin@codseq.it> <poplix@papuasia.org>
Florian Gutmann <f.gutmann@chronimo.com> <blackfeet@gmx.at>
Genie <386@mail.com>
Guntupalli Karunakar <karunakarg@yahoo.com>
+Heiko Henning <heiko@thehennings.ch> <h.henning@educa.ch>
Hiroshi Tomita <tomykaira@gmail.com>
Ian Simpson <spoonlikesham@gmail.com>
Igor Milla <igor.fsp.milla@gmail.com>
@@ -42,6 +45,7 @@ Jacek Jędrzejewski <jacek.jedrzejewski@gmail.com>
Jamie Gegerson <git@jamiegegerson.com>
Jason Oster <jay@kodewerx.org> <jay@loyalize.com>
Jay Merrifield <fracmak@gmail.com> <merrifieldj@pixia.com>
+Jean-Francois Remy <jeff@melix.org> <jfremy@virtuoz.com>
John Enters <github@darkdark.net>
Jonathan Vingiano <jvingiano@gmail.com>
Josh Varner <josh.varner@gmail.com>
@@ -49,6 +53,7 @@ Justin Domnitz <jdomnitz@gmail.com>
Justin MacCarthy <Justin@Rubystars.biz>
Jörn Zaefferer <joern.zaefferer@gmail.com>
Karl Kirch <karlkrch@gmail.com> <karl.ctr.kirch@faa.gov>
+Keith Wood <kbwood@iinet.com.au> <kbwood.au@gmail.com>
Kevin Dalman <development@allpro.net>
Klaus Hartl <klaus.hartl@gmail.com> <klaus.hartl@googlemail.com>
Klaus Hartl <klaus.hartl@gmail.com> <klaus.hartl@stilbuero.de>
@@ -97,6 +102,7 @@ Stojce Slavkovski <stojce@gmail.com>
Tarafder Ashek-E-Elahi <mail.ashek@gmail.com>
Thibault Duplessis <thibault.duplessis@gmail.com>
Ting Kuei <ting@kuei.com>
+Todd Parker <todd@filamentgroup.com> <fg.todd@gmail.com>
Wesley Walser <waw325@gmail.com> <wwalser@atlassian.com>
Xavi Ramirez <xavi.rmz@gmail.com>
Ziling Zhao <zilingzhao@gmail.com> <zizhao@cisco.com>