enricoturri1966 2f5032ab02 Fixed conflicts after merge with branch lm_surface

2022-08-18 15:48:32 +02:00

..

data

Merge branch 'master_250'

2022-07-15 15:04:10 +02:00

fonts

Support of CJK languages in ImGUI:

2019-05-23 18:04:27 +02:00

icons

Measuring: separated another gizmo

2022-07-26 16:37:51 +02:00

localization

Merged 2.5.0-beta1 into master (NO CONFLICTS FIXED)

2022-08-15 13:41:40 +02:00

profiles

Merged 2.5.0-beta1 into master (NO CONFLICTS FIXED)

2022-08-15 13:41:40 +02:00

shaders

Added shaders for OpenGL ES

2022-07-21 10:18:18 +02:00

shapes

Gallery: Update for recycling symbols

2022-07-21 10:44:09 +02:00

udev

Cleanup of file 90-3dconnexion.rules

2019-11-18 16:07:39 +01:00