Mercurial > pidgin.yaz
diff libpurple/dbus-analyze-functions.py @ 32176:f2a3c59fc4a6
Fix up merge
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sat, 25 Jun 2011 19:56:59 +0000 |
parents | 37c9f6020c35 |
children | bf65d24d84ae |
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sat, 25 Jun 2011 19:56:59 +0000 |
parents | 37c9f6020c35 |
children | bf65d24d84ae |