Mercurial > pidgin
comparison libpurple/upnp.h @ 26767:47d03538ee3f
Fix a bad merge (*sigh*)
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Fri, 01 May 2009 18:57:44 +0000 |
parents | 6bf32c9e15a7 |
children | 98520ee78f12 |
comparison
equal
deleted
inserted
replaced
26766:9331016df8ac | 26767:47d03538ee3f |
---|