Merge branch 'dev' into 'feature/web'
# Conflicts: # data/parcours2.json # mainwindow.cpp # mainwindow.h # step.cpp # step.h
This commit is contained in:
@@ -16,6 +16,7 @@ SOURCES += \
|
||||
web.cpp
|
||||
|
||||
HEADERS += \
|
||||
Undo.h \
|
||||
mainwindow.h \
|
||||
step.h \
|
||||
path.h \
|
||||
|
||||
Reference in New Issue
Block a user