Mercurial > pidgin.yaz
diff libpurple/status.h @ 26001:9115f71ad73a
Fixing busted merge
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sat, 07 Mar 2009 22:40:30 +0000 |
parents | b87a1e43389e |
children | 97e196cce25d 5391094529c6 |
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sat, 07 Mar 2009 22:40:30 +0000 |
parents | b87a1e43389e |
children | 97e196cce25d 5391094529c6 |