Skip to content

Hotfix | Fix merge conflict #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carlosgonzalez-elemwave merged 7 commits into from
Oct 22, 2025
Merged

Hotfix | Fix merge conflict #53

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c1036cb
Merge pull request #38 from OpenSEMBA/dev
lmdiazangulo Mar 31, 2025
c578ee4
Merge pull request #41 from OpenSEMBA/dev
lmdiazangulo Apr 10, 2025
b4c15c1
Update README.md
lmdiazangulo Apr 16, 2025
6bd43fd
Merge pull request #44 from OpenSEMBA/dev
lmdiazangulo Oct 18, 2025
4a0f75a
Merge pull request #47 from OpenSEMBA/dev
carlosgonzalez-elemwave Oct 20, 2025
b6d403f
Merge pull request #49 from OpenSEMBA/release-process
carlosgonzalez-elemwave Oct 21, 2025
78a38f4
Merge branch 'dev' into fix-merge-conflicts
carlosgonzalez-elemwave Oct 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,9 @@ If you use this software, please give proper attribution by citing it as indicat
This code and its copyright is property of to the University of Granada (UGR), CIF: Q1818002F, www.ugr.es. UGR has licensed its distribution under terms of the GPL-3.0 and MIT licenses (see [LICENSE](LICENSE) file) with the name of `meshlib`

testData/cervezas_alhambra logo has been downloaded from https://cults3d.com/es/modelo-3d/arte/celosia-alhambra-logo-cervezas-alhambra where is available with license CC BY-NC-SA.

## Funding

- Spanish Ministry of Science and Innovation (MICIN/AEI) (Grant Number: PID2022-137495OB-C31)
- European Union, HECATE project. (HE-HORIZON-JU-Clean-Aviation-2022-01)
- iSense Project. In-Situ Monitoring of Electromagnetic Interference. (HE-HORIZON-MSCA-2023-DN-01)
Loading