These last two merge requests have duplicate changes in both directories.
The changes are identical, because I did
git diff --staged > /tmp/z.patch
# edit file, replace qt5 with qt5
patch -p1 < /tmp/z.patch
but having two copies of same stuff isn't healthy. Does anyone still use qt4?
best
If we decided to remove qt4, then we need to decide which version of
GLViewer::postSelection(…) to use, because `meld gui/qt4 gui/qt5`
shows that this function is the only one that differs between the two
directories.
Janek Kozicki (yade) said: (by the date of Sun, 8 Mar 2020 22:54:07
2 matches
Mail list logo