diff options
| author | Robert McQueen <robert.mcqueen@collabora.co.uk> | 2006-12-12 14:10:04 +0000 |
|---|---|---|
| committer | Robert McQueen <robert.mcqueen@collabora.co.uk> | 2006-12-12 14:10:04 +0000 |
| commit | 6bdd11a937a8de282ad169a115c00bf813bf676e (patch) | |
| tree | ffbc783e8ee3b79e7e586b91d147b590d87166df /AUTHORS | |
| parent | 519fc1738f6c60b79e3582347cd38501c4c84a1d (diff) | |
| download | telepathy-glib-6bdd11a937a8de282ad169a115c00bf813bf676e.tar.gz | |
merge conflicts in AUTHORS and COPYING
20061212141004-418b8-b65979ae7f18c1cbd7db328a4a1f7d48f0f61825.gz
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -2,3 +2,11 @@ Robert McQueen <robert.mcqueen@collabora.co.uk> Rob Taylor <rob.taylor@collabora.co.uk> Ole André <ole.andre.ravnaas@collabora.co.uk> Ross Burton <ross@burtonini.com> +Simon McVittie <simon.mcvittie@collabora.co.uk> + +The Gabble source distribution includes the following third-party code: + +* src/libmd5-rfc by L. Peter Deutsch <ghost@aladdin.com>, taken from + <http://sourceforge.net/projects/libmd5-rfc/> +* src/sha1 by Allan Saddi <allan@saddi.com>, taken from + sha v1.0.4 <http://sourceforge.net/projects/sha/> |