Merge branch 'master' into opt/_AllocSprite

Author: mateoconlechuga

.gitattributes

@@ -0,0 +1,9 @@
+*.c	text eol=lf
+*.h	text eol=lf
+*.asm	text eol=lf
+*.inc	text eol=lf
+*.ini	text eol=lf
+*.log	text eol=lf
+*.bat	text eol=lf
+*.txt	text eol=lf
+*.md	text eol=lf

.gitignore

@@ -1,32 +1,35 @@
-# Object files
-*.o
-*.ko
-*.obj
-*.elf
-
-# Precompiled Headers
-*.gch
-*.pch
-
-# Libraries
-*.lib
-*.a
-*.la
-*.lo
-
-# Shared objects (inc. Windows DLLs)
-*.dll
-*.so
-*.so.*
-*.dylib
-
-# Executables
-*.exe
-*.out
-*.app
-*.i*86
-*.x86_64
-*.hex
-
-# Debug files
-*.dSYM/
+# Backups
+*~
+
+# Object files
+*.o
+*.ko
+*.obj
+*.elf
+obj/
+
+# Precompiled Headers
+*.gch
+*.pch
+relocation_table
+*_header.asm
+*_equates.asm
+
+# Libraries
+*.lib
+*.a
+*.la
+*.lo
+
+# Shared objects
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.hex
+*.8xv
+
+# Debug files
+*.dSYM/
+*.map

.gitmodules

@@ -0,0 +1,9 @@
+[submodule "src/tools/convhex"]
+	path = tools/convhex
+	url = https://github.com/MattWaltz/convhex
+[submodule "src/tools/convpng"]
+	path = tools/convpng
+	url = https://github.com/MattWaltz/convpng
+[submodule "tools/spasm-ng"]
+	path = tools/spasm-ng
+	url = https://github.com/MattWaltz/spasm-ng.git