pidgin.vv: 21e2b4a1: merge of '12e8711526f49bf6cecd4f430dec8f...

Wed Feb 11 17:15:43 EST 2009

-----------------------------------------------------------------
Revision: 21e2b4a14bb91f68d8d2857b06bb6d78ecfa7877
Ancestor: 12e8711526f49bf6cecd4f430dec8f661857221f
Ancestor: f33aa51d677e3a775ee19c0d45b1935229f3f279
Author: malu at pidgin.im
Date: 2009-02-11T22:11:18
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/21e2b4a14bb91f68d8d2857b06bb6d78ecfa7877

Modified files:
        libpurple/media.c libpurple/protocols/jabber/jingle/jingle.h
        libpurple/protocols/jabber/jingle/rtp.c pidgin/gtkmedia.c

ChangeLog: 

merge of '12e8711526f49bf6cecd4f430dec8f661857221f'
     and 'f33aa51d677e3a775ee19c0d45b1935229f3f279'