comparison pidgin/pidginstock.h @ 20515:7aaebdb013c9

explicit merge of '496506f552dcc01dcc38820f472dc9d27a82a997' and '20899a5772594c6139b37b372cfab97e03cfa2ac'
author Richard Laager <rlaager@wiktel.com>
date Sun, 16 Sep 2007 18:05:12 +0000
parents 44b4e8bd759b
children 6bf32c9e15a7
comparison
equal deleted inserted replaced
20514:723b5a2f91ce 20515:7aaebdb013c9