Merge branch 'dev' into 'feature/styleTool'

Browse Source

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

...

This commit is contained in:

JOSSERAND GIOVANNI p2405212 committed 2025-06-20 21:57:30 +00:00

2 parents a74c419c5d 2ad71467d8

commit e85e3f9c07

17 files changed

+1445 -431

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

No files matched your search

data/images/d.json

Whitespace-only changes.