1
0
mirror of https://github.com/clementine-player/Clementine synced 2025-01-24 00:11:43 +01:00
Clementine-audio-player-Mac.../ext/libclementine-common
David Sansome e718065aeb Merge branch 'master' into breakpad
Conflicts:
	src/core/commandlineoptions.h
	src/core/utilities.cpp
	src/covers/amazoncoverprovider.cpp
2013-08-04 18:05:14 +10:00
..
core Merge branch 'master' into breakpad 2013-08-04 18:05:14 +10:00
CMakeLists.txt Remove tag encoding detection as we don't really use it anymore. 2012-11-29 13:41:20 +01:00