Resolve merge conflicts from 1.12 to master #628
Conversation
modplug: set channel count and other track info on open
Get Filepath by absoluteFilePath to preserve symlinks
…off in another view
fixes lp:#1457707 probably
…pter to the help menu in the menu bar
…the Manual (Unicode 0x21D7, North east double arrow)
…ginning of main()
…culesDJControlMP3e2
Fix console output on Windows
…hem available for translation.
Fix aux.xml filename forbidden under Windows
Wrap some translatable strings in effects tooltip in tr() , and make ...
no waveform ramp
Correct settings path on windows seven+
…1 already existing)
|
hm is there any way to see just the merge conflicts? |
|
@ywwg I will send you the files that had merge conflicts. Then you can do the merge yourself, makes me feel safer ;) |
|
You only need to copy the following files from this branch: Resolving the remaining conflicts should be straightforward to resolve. The file soundsourcemodplug.cpp can simply be deleted, I don't see any reason why parsing the header when opening the SoundSource. |
uklotzde
changed the title
|
It's ok, if you're confident with the merge you did then that's fine with me. I was just wondering if there was an easy way I could skim it in github. The tests timed out on Travis, but if they pass for you then I'm ok with merging this in. |
|
Just wait a second. I've done the merge again to double check the modifications. Now I will do a clean local build, run all the tests and force push this new branch. |
…e1.12ToMaster # Conflicts: # src/library/searchquery.h # src/library/searchquery.cpp # src/main.cpp # src/soundsourcemodplug.cpp # src/test/coverartcache_test.cpp # src/test/soundproxy_test.cpp
uklotzde
changed the title
|
I've repeated the merge, just to be sure that everything is correct. If the Travis CI build and tests pass this branch will be ready for merging. The main conflicts that had to be resolved were in src/test/coverartcache_test.cpp and src/test/soundproxy_test.cpp engine/enginefilteriir.h: No manual modifications even though it is shown in the diff |
|
thanks for doing this -- if you want you could even do this once a week and make sure master is getting all our yummy bug fixes :) |
|
LGTM, Thank you. |
Resolve merge conflicts from 1.12 to master
As offered on mixxx-devel.