Merge remote-tracking branch 'upstream/master'

[16.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 61aa5c76ea68220b1a1e6c6276876c39da186b2f..3f07a93e29988a610ab2e0b3f256252d0e61ab02 100755 (executable)
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ TODO~
 LICENCE~\r
 *.mah\r
 *.MAH\r
+!makefile\r
 !modex.lib\r
 img\r
 !.git/config\r