Merge branch 'master' of github.com:1445643474/zeno · zenustech/zeno@60ab533 · GitHub

Commit

Merge branch 'master' of github.com:1445643474/zeno

Browse files

# Conflicts:
#	ui/zenoedit/acceptor/transferacceptor.cpp
#	ui/zenoedit/dialog/ZImportSubgraphsDlg.cpp
#	ui/zenoedit/res/stylesheet/pushbutton.qss
#	ui/zenoedit/zenomainwindow.cpp
#	ui/zenomodel/include/igraphsmodel.h
#	ui/zenomodel/src/graphsmodel.cpp
#	ui/zenomodel/src/graphsmodel.h
#	ui/zenomodel/src/modelacceptor.cpp

Loading branch information

1445643474 committed Oct 7, 2023

2 parents dfacf72 + fa69677 commit 60ab533