comparison libpurple/imgstore.h @ 25984:9115f71ad73a

Fixing busted merge
author Paul Aurich <paul@darkrain42.org>
date Sat, 07 Mar 2009 22:40:30 +0000
parents 2f4b10ee752b
children 32e8cdf1833c
comparison
equal deleted inserted replaced
25983:9ea3474065dc 25984:9115f71ad73a