aboutsummaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorwilliam341 <[email protected]>2017-06-29 13:13:45 -0700
committerwilliam341 <[email protected]>2017-06-29 13:13:45 -0700
commitad387c41e7d6cc547431e88695d4723ea2dba913 (patch)
treea68282dda40c4f0b28883241c7adcf9010f4550e /.gitattributes
parentb4b19e7a4d203b58537f5b98214296ab52c49b2d (diff)
parent5bebd4411bc6266cbee482a429ba794eefa8f9b6 (diff)
downloadshiftos_thereturn-ad387c41e7d6cc547431e88695d4723ea2dba913.tar.gz
shiftos_thereturn-ad387c41e7d6cc547431e88695d4723ea2dba913.tar.bz2
shiftos_thereturn-ad387c41e7d6cc547431e88695d4723ea2dba913.zip
Merge remote-tracking branch 'refs/remotes/shiftos-game/master'
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes5
1 files changed, 5 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index 1ff0c42..15e19b4 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -61,3 +61,8 @@
#*.PDF diff=astextplain
#*.rtf diff=astextplain
#*.RTF diff=astextplain
+
+# don't display Python? hopefully?
+ShiftOS.Engine/Lib/* linguist-vendored
+ResourceCompressor/res/Dependencies/* linguist-vendored
+*.py linguist-vendored