diff libpurple/dbus-analyze-signals.py @ 32113:4b53d875529f

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