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

Fix belal's unfinished merge

develop
Petr Mrázek 2010-02-21 06:23:17 +01:00
parent b33b4a895c
commit 0f79348e66
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
output/.gitignore vendored
Unescape Escape View File

@ -1,8 +1,3 @@
<<<<<<< HEAD
Debug Debug
Release Release
=======
Debug
Release
>>>>>>> remotes/peterix/master
RelWithDebInfo RelWithDebInfo