Skip to content

Commit

Permalink
gitignore: Include more rules from subdirectories
Browse files Browse the repository at this point in the history
That is: data/lua/, scons/, and utils/
  • Loading branch information
aquileia committed Jun 8, 2014
1 parent 1e9a508 commit 1715ab3
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
7 changes: 6 additions & 1 deletion .gitignore
Expand Up @@ -27,7 +27,7 @@ CMakeLists.txt

# scons
.scons-option-cache
.sconsign.dblite
*sconsign.dblite
.sconf_temp

# win32/MSVC:
Expand Down Expand Up @@ -109,6 +109,7 @@ userdata

# testing
/test*
!/test_wrapper.sh
error*.log
do_build_and_tests.sh
boost_test_result.xml
Expand All @@ -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
Expand All @@ -140,6 +144,7 @@ data/campaigns/**/images/**/.gitignore
*Neuer Ordner*

# uncategorized
*.pyc
*.swp
*.pbl
*.xhtml
Expand Down
2 changes: 0 additions & 2 deletions data/lua/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion scons/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion utils/.gitignore

This file was deleted.

0 comments on commit 1715ab3

Please sign in to comment.