Mercurial > pidgin
comparison libpurple/util.c @ 32113:4b53d875529f
fixed conflicts in previous merge.
author | tdrhq@soc.pidgin.im |
---|---|
date | Wed, 26 Aug 2009 03:19:30 +0000 |
parents | 703b20fa6c5c |
children | c9c038529f38 39716f7d2c93 |
comparison
equal
deleted
inserted
replaced
32112:1ca2df744414 | 32113:4b53d875529f |
---|