comparison pidgin/gtkmedia.c @ 28350:0a587ffcab9b

merge of '53b02d9c3c8aa71b13cea90eea22a0b60155dc8c' and 'a5f1e28f71900287ab051ba7d2ac8a6247311d13'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Wed, 19 Aug 2009 01:03:34 +0000
parents 901476dc70b9
children 8c991e09efcb
comparison
equal deleted inserted replaced
28349:901476dc70b9 28350:0a587ffcab9b