comparison doc/blist-signals.dox @ 32574:4b53d875529f

fixed conflicts in previous merge.
author tdrhq@soc.pidgin.im
date Wed, 26 Aug 2009 03:19:30 +0000
parents 0924698e2362
children e68d6c7990c1
comparison
equal deleted inserted replaced
32573:1ca2df744414 32574:4b53d875529f