Files
phoenix-firestorm/.git-blame-ignore-revs
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

22 lines
813 B
Plaintext

# Replace tabs with spaces
1b68f71348ecf3983b76b40d7940da8377f049b7
33418a77b716e122da9778869cdbabe97c83ff37
6b974724826a038b0db794460b322eb4921da735
# Trim trailing whitespace
a0b3021bdcf76859054fda8e30abb3ed47749e83
8444cd9562a6a7b755fcb075864e205122354192
863c541ce0b2e3e1e566cc88423d3e87aaedb6ca
743a1a6d8eabf069d95777c96e5b657cb8702593
4a00da1ada89af6f313cee30f5177634b0b180a9
# Wrong line endings
1b67dd855c41f5a0cda7ec2a68d98071986ca703
6cc7dd09d5e69cf57e6de7fb568a0ad2693f9c9a
e2e37cced861b98de8c1a7c9c0d3a50d2d90e433
# multiple problems
5370a6d323e14d7b4e32a3f41ef78f7744e361c5
# ignore some of the merges of ws silliness to restore blame reporting
5f1a19af725b90737d50a42a51a7bc1db12c7d13
a17fd2352a9746dd3116f956dcc554f95f17e770
# ignore beq's formatting derp
f8204c43e89d65d981a52aebf033ead5b4b3495a