cpw.qulogic.gtk3: 3e9b59f5: merge of '7b6523560e839d3775c83d46b3c466...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 3e9b59f53c6619b6f1f79fd3cd92d3ceb629df58
Parent:   7b6523560e839d3775c83d46b3c466732954bb03
Parent:   aa17fd919c5b0e1d9405ceccffb4b2e83487d6aa
Author:   qulogic at pidgin.im
Date:     12/23/11 03:22:03
Branch:   im.pidgin.cpw.qulogic.gtk3
URL: http://d.pidgin.im/viewmtn/revision/info/3e9b59f53c6619b6f1f79fd3cd92d3ceb629df58

Changelog: 

merge of '7b6523560e839d3775c83d46b3c466732954bb03'
     and 'aa17fd919c5b0e1d9405ceccffb4b2e83487d6aa'

Changes against parent 7b6523560e839d3775c83d46b3c466732954bb03

no changes

Changes against parent aa17fd919c5b0e1d9405ceccffb4b2e83487d6aa

  added    pidgin/themes
  added    libpurple/protocols/gg/win32-resolver.c
  added    libpurple/protocols/gg/win32-resolver.h
  added    pidgin/gtkconv-theme-loader.c
  added    pidgin/gtkconv-theme-loader.h
  added    pidgin/gtkconv-theme.c
  added    pidgin/gtkconv-theme.h
  added    pidgin/gtkwebview.c
  added    pidgin/gtkwebview.h
  added    pidgin/plugins/webkit.c
  added    pidgin/smileyparser.c
  added    pidgin/smileyparser.h
  added    pidgin/themes/Makefile.am
  added    pidgin/themes/Template.html