Skip to content

Commit

Permalink
gitignore: Merge rules from projectfiles/
Browse files Browse the repository at this point in the history
  • Loading branch information
aquileia committed Jun 8, 2014
1 parent 5db5871 commit 1e9a508
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 29 deletions.
24 changes: 23 additions & 1 deletion .gitignore
Expand Up @@ -39,6 +39,24 @@ uninstall.vcproj
*.vcproj.*.user
projectfiles/VC[12]*

# XCode
projectfiles/Xcode/**/build
projectfiles/Xcode/**/Headers
projectfiles/Xcode/**/Wesnoth.dmgCanvas
projectfiles/Xcode/**/*.mode1v3
projectfiles/Xcode/**/*.pbxuser
projectfiles/Xcode/**/xcuserdata
projectfiles/Xcode/**/project.xcworkspace

# CodeBlocks
projectfiles/**/.clang
projectfiles/**/wesnoth.tags
projectfiles/**/wesnoth.workspace.*
projectfiles/**/*.depend
projectfiles/**/*.layout
projectfiles/**/*_build_log.html
projectfiles/**/*objs*

# eclipse
.settings
!utils/umc_dev/org.wesnoth*/.settings/
Expand All @@ -62,22 +80,26 @@ stamp-h1
/cutter*
/exploder*
/build/
Release
Debug
ReleaseDEBUG
Debug (fast)
tags

# build results ect.
wesnoth.exp
wesnoth.ilk
wesnoth.lib
wesnoth.ncb
wesnoth.suo
wesnoth.opt
wesnoth.plg
*.exe
*.dll

# library files
.libs
Lib
[Ll]ib
!data/ai/formula/lib/
!src/gui/lib/

Expand Down
4 changes: 0 additions & 4 deletions projectfiles/CodeBlocks-SCons/.gitignore

This file was deleted.

6 changes: 0 additions & 6 deletions projectfiles/CodeBlocks/.gitignore

This file was deleted.

3 changes: 0 additions & 3 deletions projectfiles/CodeLite/.gitignore

This file was deleted.

7 changes: 0 additions & 7 deletions projectfiles/VC9/.gitignore

This file was deleted.

4 changes: 0 additions & 4 deletions projectfiles/Xcode/.gitignore

This file was deleted.

4 changes: 0 additions & 4 deletions projectfiles/Xcode/Wesnoth.xcodeproj/.gitignore

This file was deleted.

0 comments on commit 1e9a508

Please sign in to comment.