diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-13 08:45:37 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-13 08:45:37 +0300 |
| commit | 1da6053cdef9828bcb4f75e21cd655edc15e3c4e (patch) | |
| tree | 4a65471a738bb6fa51fb7e99e5e0c6ba77701f1b /.git-blame-ignore-revs | |
| parent | eceab67f0ea4edac07d0faf87d28a725a9d69084 (diff) | |
| parent | f32a6d40aa47c887d0c98a937a37dfa4d6893768 (diff) | |
Merge commit 'f32a6d40aa' into marchcat/c-develop
# Conflicts:
# indra/llmath/v2math.cpp
# indra/llmath/v2math.h
# indra/llmath/v3math.h
# indra/llmath/v4math.h
# indra/newview/llagent.cpp
# indra/newview/llagentcamera.h
# indra/newview/llfloaternamedesc.cpp
# indra/newview/llfloaternamedesc.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llmaterialeditor.cpp
# indra/newview/llreflectionmap.cpp
# indra/newview/llviewerassetupload.cpp
# indra/newview/llviewercamera.cpp
# indra/newview/llviewercamera.h
# indra/newview/llviewermenufile.cpp
# indra/newview/llviewerobject.h
# indra/newview/llvovolume.h
Diffstat (limited to '.git-blame-ignore-revs')
0 files changed, 0 insertions, 0 deletions