diff pidgin/win32/gtkdocklet-win32.c @ 31353:a4f3d21f393c

merge of '69fbc32fd3dfe8ca0979e1c486c3d51eb06088cf' and 'a3c4035630c492aaae37ec8ddb8943c2f465e166'
author Paul Aurich <paul@darkrain42.org>
date Mon, 08 Nov 2010 17:05:53 +0000
parents b5b20df96c20
children a8cc50c2279f
line wrap: on
line diff