Merge branch 'dev' of https://github.com/Regalis11/scpcb into 1.3.10

KINGlloris · Jul 20, 2018 · 84b5fc2 · 84b5fc2
2 parents d886b53 + e1ab9ab
commit 84b5fc2
Show file tree

Hide file tree

Showing 14 changed files with 3 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,6 @@ Saves/*
 error_log_*
 .vscode
 updates/
+Thumbs.db
+thumbs.db
+*.SI
diff --git a/GFX/895pics/Thumbs.db b/GFX/895pics/Thumbs.db
diff --git a/GFX/Thumbs.db b/GFX/Thumbs.db
diff --git a/GFX/items/1025/Thumbs.db b/GFX/items/1025/Thumbs.db
diff --git a/GFX/items/Thumbs.db b/GFX/items/Thumbs.db
diff --git a/GFX/map/Thumbs.db b/GFX/map/Thumbs.db
diff --git a/GFX/map/forest/Thumbs.db b/GFX/map/forest/Thumbs.db
diff --git a/GFX/map/sky/Thumbs.db b/GFX/map/sky/Thumbs.db
diff --git a/GFX/menu/Thumbs.db b/GFX/menu/Thumbs.db
diff --git a/GFX/menu/achievements/Thumbs.db b/GFX/menu/achievements/Thumbs.db
diff --git a/GFX/npcs/Thumbs.db b/GFX/npcs/Thumbs.db
diff --git a/GFX/screens/Thumbs.db b/GFX/screens/Thumbs.db
diff --git a/SFX/Music/thumbs.db b/SFX/Music/thumbs.db
diff --git a/SFX/SCP/970/thumbs.db b/SFX/SCP/970/thumbs.db