Mercurial > pidgin.yaz
diff COPYRIGHT @ 25717:907ca9a36fe0
explicit merge of '714a7c7f903d11c96ffade34966121da549d998f'
and 'd2c40fe4e2181eda5c1c631c7805f17e6b5d22c3'
to branch 'org.darkrain42.pidgin.xmpp'
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Thu, 20 Nov 2008 21:13:56 +0000 |
parents | dc359ea9eb9a |
children | b0812ce0ec17 |
line wrap: on
line diff
--- a/COPYRIGHT Mon Aug 18 17:08:01 2008 +0000 +++ b/COPYRIGHT Thu Nov 20 21:13:56 2008 +0000 @@ -8,7 +8,6 @@ Dave Ahlswede Manuel Amador Matt Amato -Elliott Sales de Andrade Geoffrey Antos Daniel Atallah Paul Aurich @@ -49,6 +48,7 @@ Chris Boyle Derrick J Brashear Mauro Sérgio Ferreira Brasil +Luke Bratch Matt Brenneke Jeremy Brooks Jonathan Brossard @@ -157,10 +157,12 @@ Konrad Gräfe Miah Gregory David Grohmann +Vladislav Guberinić Gideon N. Guillen Christian Hammond Erick Hamness Fred Hampton +Phil Hannent Casey Harkins Andy Harrison Andrew Hart (arhart) @@ -228,6 +230,7 @@ Wesley Lin Artem Litvinovich Josh Littlefield +Daniel Ljungborg Syd Logan Lokheed Norberto Lopes @@ -338,6 +341,7 @@ Michael Ruprecht Sam S. Thanumalayan S. +Elliott Sales de Andrade Tomasz Sałaciński <tsalacinski@gmail.com> Pradyumna Sampath Arvind Samptur