Mercurial > pidgin.yaz
diff libpurple/cipher.h @ 26001:9115f71ad73a
Fixing busted merge
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sat, 07 Mar 2009 22:40:30 +0000 |
parents | 584063555949 |
children | 64587c6084e3 |
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sat, 07 Mar 2009 22:40:30 +0000 |
parents | 584063555949 |
children | 64587c6084e3 |