Merge branch 'release-1.2'

Browse Source

Conflicts:
	dist/windows/clementine.nsi.in
	src/core/mergedproxymodel.h
	src/core/utilities.cpp
	src/internet/spotifyblobdownloader.cpp
	src/main.cpp

...

This commit is contained in:

David Sansome 2014-06-07 11:56:06 +10:00

parent 4aa42cdce9 1957c41ada

commit e695aaee44

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

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

Diff Content Not Available