On 2022-02-06 17:11, Nicklas SB Karlsson wrote:
Den 2022-02-06 kl. 13:34, skrev Tim Blume:
Are you trying to build the old gtk3 branch, that is already merged
into master by any chance?
Not sure.
Searching the source tree I found lib/python/multifilebuilder_gtk3.py
is in master-gtk3 branch but not in ethercat2.8 or master branch.
If you compare the branches master and master-gtk3, you can see that the
file 'lib/python/multifilebuilder_gtk3.py' has been merged into
'lib/python/multifilebuilder.py'. If ethercat2.8 is based on version
2.8, it should still use gtk2.
Trying git log --oneline --graph --decorate --all|less I could see the
branches but are little bit to many to figure out.
There is actually a pr that has been included in the master-gtk3 branch,
after it was originally merged. Is it possible for a dev to take a look
at it, and if it's still good, merge it in with master and then delete
the master-gtk3 branch? It seems to create some confusion of which
master branch to use. If there isn't any reason to keep it around.
Håvard
_______________________________________________
Emc-developers mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/emc-developers
