diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-05-17 11:13:48 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-05-17 11:13:48 +0200 |
| commit | 9eff940a64b406b57b4d4d8fc9a8e5dad6a7d871 (patch) | |
| tree | 3d8b3fadff25c8bf8b2fb9c50e1a92f0b5afcbbb /platform/android/java_class_wrapper.cpp | |
| parent | 096fb3ad7cc517e401eb2aa6b29dbc213e0bf200 (diff) | |
| parent | 8a92615ba0456844e6368f31be42ecf738ae88e7 (diff) | |
| download | redot-engine-9eff940a64b406b57b4d4d8fc9a8e5dad6a7d871.tar.gz | |
Merge pull request #91549 from magian1127/4.0ChangeHighlightingStartKey
Resolve conflict between shader uniform tooltips `/**` and general annotation `/**/`.
Diffstat (limited to 'platform/android/java_class_wrapper.cpp')
0 files changed, 0 insertions, 0 deletions