Mercurial > pidgin.yaz
comparison libpurple/cipher.h @ 20108:88b97e07f35f
merge of '688a896af7f228132e0f78057e7ed5812c3f7b13'
and 'a6d6e5d83afac011fd739de6e393618695171e7c'
author | Will Thompson <will.thompson@collabora.co.uk> |
---|---|
date | Tue, 18 Sep 2007 16:32:46 +0000 |
parents | 6bf32c9e15a7 |
children | f296be2a1039 |
comparison
equal
deleted
inserted
replaced
20070:efadfc6e2117 | 20108:88b97e07f35f |
---|---|
1 /** | 1 /** |
2 * @file cipher.h Purple Cipher API | 2 * @file cipher.h Purple Cipher API |
3 * @ingroup core | 3 * @ingroup core |
4 * | 4 */ |
5 * purple | 5 |
6 /* purple | |
6 * | 7 * |
7 * Purple is the legal property of its developers, whose names are too numerous | 8 * Purple is the legal property of its developers, whose names are too numerous |
8 * to list here. Please refer to the COPYRIGHT file distributed with this | 9 * to list here. Please refer to the COPYRIGHT file distributed with this |
9 * source distribution. | 10 * source distribution. |
10 * | 11 * |