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 regards Janek -- Janek Kozicki, PhD. DSc. Arch. Assoc. Prof. Gdańsk University of Technology Faculty of Applied Physics and Mathematics Department of Theoretical Physics and Quantum Information -- http://yade-dem.org/ http://pg.edu.pl/jkozicki (click English flag on top right) _______________________________________________ Mailing list: https://launchpad.net/~yade-dev Post to : yade-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~yade-dev More help : https://help.launchpad.net/ListHelp
