Merge branch 'dev' into 'feature/styleTool'

Browse Source

# Conflicts:
#   mainwindow.cpp
#   mainwindow.h
#   mainwindow.ui

...

This commit is contained in:

JOSSERAND GIOVANNI p2405212

2025-06-20 21:57:30 +00:00

parent a74c419c5d 2ad71467d8

commit e85e3f9c07

17 changed files with 1445 additions and 431 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

data/images/d.json