Mercurial > pidgin
diff src/media.c @ 12144:d93e6979b77a
[gaim-migrate @ 14445]
Fix a conflict in mnemonics I added. I'm going to force SimGuy to write a patch if I've done this wrong again.
committer: Tailor Script <tailor@pidgin.im>
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sat, 19 Nov 2005 00:34:04 +0000 |
parents | 90d7e0f342fa |
children | 31b91bfab029 |