diff pidgin/gtkthemes.c @ 32574:4b53d875529f

fixed conflicts in previous merge.
author tdrhq@soc.pidgin.im
date Wed, 26 Aug 2009 03:19:30 +0000
parents c410e48a31c6
children e1cc8d07fe07
line wrap: on
line diff