Merge branch 'master' into mhd

Browse Source

Conflicts:
	src/AccountDelegate.cpp
	src/libtomahawk/playlist/TrackView.cpp
	src/libtomahawk/widgets/SearchWidget.cpp

...

This commit is contained in:

Leo Franchi

2012-04-27 17:30:22 -04:00

parent 7fc03770d0 f5873c283a

commit 8d6a4335b8

663 changed files with 9751 additions and 9666 deletions

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

1176

src/libtomahawk/TomahawkSettings.cpp Normal file

File diff suppressed because it is too large Load Diff