Mercurial > pidgin.yaz
diff gaim.pc.in @ 32574:4b53d875529f
fixed conflicts in previous merge.
author | tdrhq@soc.pidgin.im |
---|---|
date | Wed, 26 Aug 2009 03:19:30 +0000 |
parents | dde5bebd5fb4 |
children |
author | tdrhq@soc.pidgin.im |
---|---|
date | Wed, 26 Aug 2009 03:19:30 +0000 |
parents | dde5bebd5fb4 |
children |