Merge branch 'msn-gabble'
author Daniele E. Domenichelli
()
committer Daniele E. Domenichelli
()
commit 7ac3224df135e6945f1e970b4f562a2e87655a38
tree c880cf9103ffbd38a9b8c0651f25efb17b63e027
parent 693bca37a3b0085f230c8f6eb63d354e35cba18a
parent d50bc019b36b7f00ce4fcbe13116b98d0ceb189c
Merge branch 'msn-gabble'

Reviewed-by: David Edmundson <kde@davidedmundson.co.uk>
data/profiles/msn-xmpp.profile [ new file with mode 0644 ]
plugins/gabble/CMakeLists.txt
plugins/gabble/gabble-account-ui.cpp
plugins/gabble/main-options-widget-msn.cpp [ new file with mode 0644 ]
plugins/gabble/main-options-widget-msn.h [ new file with mode 0644 ]
plugins/gabble/main-options-widget-msn.ui [ new file with mode 0644 ]