diff --git a/.gitignore b/.gitignore index a28139c496e2..1077137389a2 100644 --- a/.gitignore +++ b/.gitignore @@ -27,7 +27,7 @@ CMakeLists.txt # scons .scons-option-cache -.sconsign.dblite +*sconsign.dblite .sconf_temp # win32/MSVC: @@ -109,6 +109,7 @@ userdata # testing /test* +!/test_wrapper.sh error*.log do_build_and_tests.sh boost_test_result.xml @@ -128,6 +129,9 @@ po/**/Makefile* !po/wesnoth-manpages/Makefile !po/wesnoth-manual/Makefile +# file for loading lua from within test scenario on-the-fly +data/lua/**/code.lua + # previous .gitignore files po/**/.gitignore images/**/.gitignore @@ -140,6 +144,7 @@ data/campaigns/**/images/**/.gitignore *Neuer Ordner* # uncategorized +*.pyc *.swp *.pbl *.xhtml diff --git a/data/lua/.gitignore b/data/lua/.gitignore deleted file mode 100644 index dda10c23b15f..000000000000 --- a/data/lua/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -#file for loading lua from within test scenario on-the-fly -code.lua diff --git a/scons/.gitignore b/scons/.gitignore deleted file mode 100644 index 0d20b6487c61..000000000000 --- a/scons/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.pyc diff --git a/utils/.gitignore b/utils/.gitignore deleted file mode 100644 index 1d760b48140a..000000000000 --- a/utils/.gitignore +++ /dev/null @@ -1 +0,0 @@ -sconsign.dblite