comparison pidgin/pidginstock.h @ 20943:e0d7429cfd8a

merge of '4d5bbc54236419e777e3df044678b798605409bf' and 'cca81a1b623d3a31f3a7d03158eddb36ecf4bfbc'
author Daniel Atallah <daniel.atallah@gmail.com>
date Mon, 15 Oct 2007 02:11:13 +0000
parents 6bf32c9e15a7
children bd25f8c9d94e 92e71f6e10d4
comparison
equal deleted inserted replaced
20940:d1695d02c498 20943:e0d7429cfd8a