Mercurial > pidgin.yaz
diff finch/gntstatus.h @ 16732:ca69d4253246
explicit merge of '92e787fa231318dd21ddc9dd68f17b636033b13e'
and 'ea739f0c09468a0ca1e1761b05a4d5a453f402ec'
author | Jeffrey Connelly <jaconnel@calpoly.edu> |
---|---|
date | Tue, 01 May 2007 03:11:38 +0000 |
parents | 0f0832c13fcb |
children | 44b4e8bd759b |