Merge branch 'google_hint_link' of https://github.com/willstott101/tomahawk into google_hint_link

Browse Source

Conflicts:
	src/accounts/google/GoogleWrapper.cpp
	src/accounts/xmpp/XmppAccount.cpp
	src/accounts/xmpp/XmppConfigWidget.ui

...

This commit is contained in:

Will Stott

2014-09-21 18:40:55 +01:00

parent 7b1e719511 ee65c8d824

commit 8ca7de8ac2

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available