Ansariel 312d077884 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm ... # Conflicts: # indra/llimagej2coj/llimagej2coj.cpp		2025-09-23 09:58:52 +02:00
..
html	…
textures	Possibly a better icon for the new Camera TPP preset button #2	2025-09-15 22:11:55 +02:00
themes/textures	…
xui	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2025-09-23 09:58:52 +02:00
colors.xml	…
default_languages.xml	…
settings.xml	…
toolbars.xml	…