Open dirk-zimoch opened 4 years ago
I'll apply the changes to pvif.h
, but not the changes to softMain.cpp
. The later is a transplant from Base (3dbe94d87a2409a8222fd8db750dbbfaf37bd68d) with minimal edits (243f039280edfbf04947495758c52d1bd40f5383 and 266f2f9d2d01713cf6071d194db3c056c4020b5b). Making cosmetic changes can only complicate taking future updates from Base (which could happen anytime).
... except he's proposing the same changes to Base. Unfortunately now is probably not the best time to do them since we have several branches outstanding and this complicates the merge.
BTW I'm in the middle of merging 3.15 into 7.0, can you avoid pushing anything into that branch until I'm done as it wasn't clean so needs lots of manual fixes and I don't know now to recover if the tip moves while I'm doing that...
he's proposing the same changes to Base.
Good. The flow I'd like is to change Base, and then update pva2pva from Base.
now is probably not the best time to do them
There is no good time, only the present time.
This is purely cosmetic: