No longer tracking automatically generated files

2024-11-28 08:20:54 +01:00 · 2012-08-30 05:59:25 -07:00 · 2012-08-30 05:59:25 -07:00 · d0abad38b7
commit d0abad38b7
parent c8266b2b8b
7 changed files with 0 additions and 6 deletions
--- a/.gitignore
+++ b/.gitignore
@ -4,14 +4,8 @@
 *.vspscc
 /ext_libs/Debug
 /ext_libs/Release
-<<<<<<< HEAD
-<<<<<<< HEAD
 /ext_libs/*.exp
 /ext_libs/*.lib
-=======
->>>>>>> Tossed in missing files
-=======
->>>>>>> Tossed in missing files
 /fb2k/Debug
 /fb2k/Release
 /src/Debug
--- a/ext_libs/libg7221_decode.exp
+++ b/ext_libs/libg7221_decode.exp
--- a/ext_libs/libg7221_decode.lib
+++ b/ext_libs/libg7221_decode.lib
--- a/ext_libs/libmpg123-0.exp
+++ b/ext_libs/libmpg123-0.exp
--- a/ext_libs/libmpg123-0.lib
+++ b/ext_libs/libmpg123-0.lib
--- a/ext_libs/libvorbis.exp
+++ b/ext_libs/libvorbis.exp
--- a/ext_libs/libvorbis.lib
+++ b/ext_libs/libvorbis.lib