comparison libpurple/stun.h @ 32574:4b53d875529f

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