1925bb404ec47b6e074c5e3b334fe0be12176d7b
Conflicts: src/multimedia/playback/playlistfileparser.cpp src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp Change-Id: I52950def2b8283ae15797d05d4ead6a1256eba19
Description
No description provided
Languages
C++
90.5%
Objective-C++
5.8%
QMake
1%
Objective-C
0.9%
QML
0.5%
Other
1%