Mercurial > pidgin.yaz
diff COPYRIGHT @ 25252:1fb7db5e1d7c
propagate from branch 'im.pidgin.pidgin' (head df6eba32e5b6b34d7483cbfb7e9f2e4c836ac35f)
to branch 'im.pidgin.cpw.malu.xmpp.ibb_ft' (head 112c127a12d04bb497c793f97f3c3c2c3bc079ea)
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 22 Dec 2008 08:38:39 +0000 |
parents | f5c0cdaef99a |
children | 8b55fcc6adde |
line wrap: on
line diff
--- a/COPYRIGHT Wed Dec 17 22:38:49 2008 +0000 +++ b/COPYRIGHT Mon Dec 22 08:38:39 2008 +0000 @@ -345,6 +345,7 @@ Luciano Miguel Ferreira Rocha Andrew Rodland Miguel RodrÃguez (migrax) +Martin Rosinski Bob Rossi Jason Roth Jean-Francois Roy @@ -473,6 +474,7 @@ Alex Willmer Matt Wilson Dan Winship +Michal Witkowski Scott Wolchok The Written Word, Inc. Kevin Wu Won