Mercurial > pidgin
diff libpurple/mime.h @ 20690:b92fde9b03a6
propagate from branch 'im.pidgin.rlaager.merging.2_2_1_conflicts' (head 193dd268b0be5ca0a4a8fa0e4188452907114be0)
to branch 'im.pidgin.pidgin' (head 563924526117e45ff6134011258940e8b1988d72)
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Fri, 28 Sep 2007 17:20:33 +0000 |
parents | 44b4e8bd759b |
children | 0c796a1950b7 |