Commit Graph

11 Commits (b49c3a083b73f6a5762f353f618a2e1fe25cf690)

Author SHA1 Message Date
Ansariel 431b3b0c6d Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	.github/workflows/pre-commit.yaml
#	indra/cmake/LLPhysicsExtensions.cmake
#	indra/llwindow/llopenglview-objc.mm
#	indra/newview/CMakeLists.txt
#	indra/newview/llappdelegate-objc.mm
2025-10-20 23:56:48 +02:00
Rye 993851cc2a Ignore tabs to spaces for objc in blame 2025-10-20 19:39:49 +03:00
Beq 1ddd585c18 let's ignore this beq-derp in the blame 2025-04-17 16:59:25 +01:00
Beq bdaf67912e ignore a few of the upstream merges of white space changes that hide blame 2025-03-04 01:49:53 +00:00
Brad Linden b0597e927a add some more whitespace commits to .git-blame-ignore-revs 2024-09-18 20:04:24 -07:00
Brad Linden 9890b5b2e7 added .git-blame-ignore for last commit 2024-09-18 12:26:11 -07:00
Brad Linden c63cfaa15d Updated git-blame-ignore-revs 2024-06-28 13:00:53 -07:00
Brad Linden aebfdfa48b Added git-blame-ignore entry for whitespace change 2024-06-18 11:57:54 -07:00
Brad Linden ae74ca8069 Add whitespace change to .git-blame-ignore-revs for pr #1723 2024-06-12 14:39:32 -07:00
Andrey Lihatskiy e7df06c32b Add line endings changes to .git-blame-ignore-revs 2024-06-10 20:34:36 +03:00
Bennett Goble 5fccb53993 Add whitespace changes to .git-blame-ignore-revs 2024-05-29 08:22:37 -07:00