Mercurial > pidgin
diff libpurple/status.c @ 26767:47d03538ee3f
Fix a bad merge (*sigh*)
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Fri, 01 May 2009 18:57:44 +0000 |
parents | 8c8948b9f602 |
children | 6428ebfbc893 5391094529c6 |
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Fri, 01 May 2009 18:57:44 +0000 |
parents | 8c8948b9f602 |
children | 6428ebfbc893 5391094529c6 |