Mercurial > pidgin
diff libpurple/network.c @ 20413:fd7b501cc9c8
fix up broken merge
author | Ka-Hing Cheung <khc@hxbc.us> |
---|---|
date | Sat, 12 May 2007 19:35:18 +0000 |
parents | 4999bbc52881 |
children | 6d0bc0b23440 |
author | Ka-Hing Cheung <khc@hxbc.us> |
---|---|
date | Sat, 12 May 2007 19:35:18 +0000 |
parents | 4999bbc52881 |
children | 6d0bc0b23440 |