MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'recent' into diggingInvaders-unstable 

Conflicts:
	library/modules/Job.cpp
	library/modules/Maps.cpp
develop
expwnent 2013-01-02 11:36:57 -05:00
parent 144e0b4dcb f680ef7ee3
commit d35164656f
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
Unescape Escape View File

@ -57,3 +57,6 @@ dfhack/python/dist
build/CPack*Config.cmake build/CPack*Config.cmake
/cmakeall.bat /cmakeall.bat
# swap files for vim
*.swp