Conflicts: src/files.c src/potion.c sys/winnt/Makefile.msc Changes to be committed: modified: .gitignore modified: DEVEL/hooksdir/nhsub modified: dat/.gitignore modified: dat/opthelp modified: doc/Guidebook.mn modified: doc/Guidebook.tex modified: doc/fixes35.0 modified: include/context.h modified: include/decl.h modified: include/extern.h modified: include/flag.h modified: include/hack.h modified: include/patchlevel.h modified: src/apply.c modified: src/attrib.c modified: src/decl.c modified: src/do.c modified: src/do_name.c modified: src/dothrow.c modified: src/eat.c modified: src/files.c modified: src/hack.c modified: src/invent.c modified: src/lock.c modified: src/mklev.c modified: src/mondata.c modified: src/monmove.c modified: src/music.c modified: src/options.c modified: src/potion.c modified: src/pray.c modified: src/sit.c modified: src/sp_lev.c modified: src/uhitm.c modified: sys/share/posixregex.c modified: sys/winnt/Makefile.msc modified: util/.gitignore modified: win/win32/vs2010/NetHackW.vcxproj
55 lines
584 B
Plaintext
55 lines
584 B
Plaintext
# CVS default ignores begin
|
|
tags
|
|
TAGS
|
|
.make.state
|
|
.nse_depinfo
|
|
*~
|
|
\#*
|
|
.#*
|
|
,*
|
|
_$*
|
|
*$
|
|
*.old
|
|
*.bak
|
|
*.BAK
|
|
*.orig
|
|
*.rej
|
|
.del-*
|
|
*.a
|
|
*.olb
|
|
*.o
|
|
*.obj
|
|
*.so
|
|
*.exe
|
|
*.Z
|
|
*.elc
|
|
*.ln
|
|
core
|
|
# CVS default ignores end
|
|
.*.swp
|
|
|
|
# We generate makefiles by shell script
|
|
Makefile
|
|
|
|
# Win32-specific ignores
|
|
Debug/
|
|
Release/
|
|
binary/
|
|
build/
|
|
ipch/
|
|
Nethack.sln
|
|
Nethack.sdf
|
|
Nethack.opensdf
|
|
Makefile.bcc
|
|
Makefile.gcc
|
|
Makefile-orig
|
|
Makefile.bcc-orig
|
|
Makefile.gcc-orig
|
|
*.suo
|
|
*.pdb
|
|
*.ilk
|
|
# VS2013 extension to auto-whine about questionable code generates these
|
|
*.lastcodeanalysissucceeded
|
|
# Win32-specific ignores end
|
|
|