comparison pidgin/gtksound.c @ 32574:4b53d875529f

fixed conflicts in previous merge.
author tdrhq@soc.pidgin.im
date Wed, 26 Aug 2009 03:19:30 +0000
parents 527836da73d1
children 08f8d45e3a14 224f9674a57e 338d6a211055
comparison
equal deleted inserted replaced
32573:1ca2df744414 32574:4b53d875529f