David Sansome
e718065aeb
Merge branch 'master' into breakpad
Conflicts: src/core/commandlineoptions.h src/core/utilities.cpp src/covers/amazoncoverprovider.cpp
Languages
C++
95.6%
CMake
2%
Objective-C++
1.4%
C
0.5%
Objective-C
0.4%