aboutsummaryrefslogtreecommitdiff
path: root/deps/lightning/.gitattributes
diff options
context:
space:
mode:
authorTwinaphex2020-02-08 16:24:22 +0100
committerGitHub2020-02-08 16:24:22 +0100
commit0adc619b5a5705d16cc6caea64951776ababbb96 (patch)
treefbae9b1d18d04d8e7908aa1c3446782ebf6e8785 /deps/lightning/.gitattributes
parent0204c39a68a1fd4bf667aa8ece5a769f2983b7d0 (diff)
parent6f1edc3c7fd1f7f58155107d0c99d0ac7d22443b (diff)
downloadpcsx_rearmed-0adc619b5a5705d16cc6caea64951776ababbb96.tar.gz
pcsx_rearmed-0adc619b5a5705d16cc6caea64951776ababbb96.tar.bz2
pcsx_rearmed-0adc619b5a5705d16cc6caea64951776ababbb96.zip
Merge pull request #377 from pcercuei/libretro
Lightrec dynarec
Diffstat (limited to 'deps/lightning/.gitattributes')
-rw-r--r--deps/lightning/.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/deps/lightning/.gitattributes b/deps/lightning/.gitattributes
new file mode 100644
index 0000000..e8495d5
--- /dev/null
+++ b/deps/lightning/.gitattributes
@@ -0,0 +1 @@
+ChangeLog merge=merge-changelog