diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-09-23 21:54:25 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-09-23 22:08:43 +0300 |
| commit | 46448f9547102cce3e23c522467ef800c8c266fc (patch) | |
| tree | 7e0d9f09e0a9049470523fa5b827804a140926f0 /.git-blame-ignore-revs | |
| parent | 4274eb591a1b0806f8c73ca16df65ade60db2200 (diff) | |
| parent | 3747dd9a085e4d75ec21c8048f1269bc3f29e582 (diff) | |
Merge branch 'develop' into marchcat/b-develop
# Conflicts:
# indra/newview/llfeaturemanager.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvoicewebrtc.cpp
Diffstat (limited to '.git-blame-ignore-revs')
| -rw-r--r-- | .git-blame-ignore-revs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 0851d20be0..c68131402b 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -5,7 +5,11 @@ a0b3021bdcf76859054fda8e30abb3ed47749e83 8444cd9562a6a7b755fcb075864e205122354192 863c541ce0b2e3e1e566cc88423d3e87aaedb6ca +743a1a6d8eabf069d95777c96e5b657cb8702593 +4a00da1ada89af6f313cee30f5177634b0b180a9 # Wrong line endings 1b67dd855c41f5a0cda7ec2a68d98071986ca703 6cc7dd09d5e69cf57e6de7fb568a0ad2693f9c9a e2e37cced861b98de8c1a7c9c0d3a50d2d90e433 +# multiple problems +5370a6d323e14d7b4e32a3f41ef78f7744e361c5 |