mirror of
https://github.com/ZDoom/qzdoom-gpl.git
synced 2024-11-15 16:51:31 +00:00
2d87eb0ba2
Conflicts: src/CMakeLists.txt src/actor.h src/g_heretic/a_hereticmisc.cpp src/g_heretic/a_hereticweaps.cpp src/g_heretic/a_ironlich.cpp src/info.h src/namedef.h src/p_buildmap.cpp src/p_enemy.cpp src/p_map.cpp src/p_mobj.cpp src/thingdef/thingdef_codeptr.cpp zdoom.vcproj
42 lines
649 B
Text
42 lines
649 B
Text
/Debug
|
|
*.ncb
|
|
*.suo
|
|
*.pdb
|
|
*.ilk
|
|
*.aps
|
|
/Release
|
|
/wadsrc_wad
|
|
*.user
|
|
/debug
|
|
/release
|
|
*/debug
|
|
*/release
|
|
/release_gcc
|
|
/dumb/vc6/dumb_static/release
|
|
/dumb/vc6/dumb_static/debug
|
|
/dumb/vc6/dumb_static/x64
|
|
/DOOMSTATS.TXT
|
|
/src/gitinfo.h
|
|
/src/sc_man_scanner.h
|
|
/src/xlat/xlat_parser.c
|
|
/src/xlat/xlat_parser.h
|
|
/src/xlat/xlat_parser.out
|
|
/src/zscript/zcc-parse.c
|
|
/src/zscript/zcc-parse.h
|
|
/src/zscript/zcc-parse.out
|
|
/tools/*/debug
|
|
/tools/*/release
|
|
/tools/*/*.exe
|
|
/tools/lemon/build
|
|
/tools/re2c/build
|
|
/tools/updaterevision/x64/
|
|
/tools/zipdir/x64
|
|
/wadsrc/*.pk3
|
|
/build_vc2013
|
|
/bzip2/x64/
|
|
/disasm.txt
|
|
/game-music-emu/x64/
|
|
/gdtoa/x64/
|
|
/jpeg-6b/x64/
|
|
/lzma/x64/
|
|
/zlib/x64/
|