comparison src/gtkidle.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 3c1bac709234
children 891aeb151590
comparison
equal deleted inserted replaced
12143:cbebda5f019c 12144:d93e6979b77a