Mercurial > pidgin
diff libpurple/imgstore.h @ 26767:47d03538ee3f
Fix a bad merge (*sigh*)
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Fri, 01 May 2009 18:57:44 +0000 |
parents | 2f4b10ee752b |
children | 32e8cdf1833c |
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Fri, 01 May 2009 18:57:44 +0000 |
parents | 2f4b10ee752b |
children | 32e8cdf1833c |