nhmall 77dd76ed17 Merge branch 'master' into win32-x64-working ...

Resolved Conflicts:
	src/cmd.c
	src/mkobj.c

 All conflicts fixed but you are still merging.

 Changes to be committed:
	modified:   dat/Priest.des
	modified:   dat/Rogue.des
	modified:   dat/Valkyrie.des
	modified:   dat/Wizard.des
	modified:   dat/gehennom.des
	modified:   src/cmd.c
	modified:   src/mkobj.c
	modified:   src/steal.c
	modified:   sys/share/lev_yacc.c
	modified:   util/lev_comp.y

2015-05-02 13:53:08 -04:00

..

sounds

*** empty log message ***

2002-01-05 21:05:59 +00:00

.gitattributes

NHDT substitution version 2.

2015-03-31 09:50:02 -04:00

cppregex.cpp

Add POSIX implementation of regex.

2015-04-12 11:46:56 -04:00

dgn_comp.h

*** empty log message ***

2002-01-05 21:05:57 +00:00

dgn_lex.c

sync sys/share/{dgn,lev}_{lex,yacc}.c, take two (trunk only)

2009-05-11 22:53:51 +00:00

dgn_yacc.c

sync sys/share/{dgn,lev}_{lex,yacc}.c, take two (trunk only)

2009-05-11 22:53:51 +00:00

ioctl.c

Bulk recovery of file CVS headers and addition of NHDT- headers.

2015-03-17 18:45:12 +02:00

lev_comp.h

Update precompiled lex/yacc files

2015-03-21 20:37:44 +02:00

lev_lex.c

Update precompiled lex and yacc files

2015-04-10 19:45:04 +03:00

lev_yacc.c

Update pregenerated levcomp lex and yacc files

2015-05-02 18:33:14 +03:00

Makefile.lib

Bulk recovery of file CVS headers and addition of NHDT- headers.

2015-03-17 18:45:12 +02:00

NetHack.cnf

Add menucolors

2015-04-02 20:16:25 +03:00

nhlan.c

Bulk recovery of file CVS headers and addition of NHDT- headers.

2015-03-17 18:45:12 +02:00

pcmain.c

build both tty NetHack.exe and gui NetHackW.exe

2015-04-22 00:07:46 -04:00

pcsys.c

build both tty NetHack.exe and gui NetHackW.exe

2015-04-22 00:07:46 -04:00

pctty.c

Bulk recovery of file CVS headers and addition of NHDT- headers.

2015-03-17 18:45:12 +02:00

pcunix.c

build both tty NetHack.exe and gui NetHackW.exe

2015-04-22 00:07:46 -04:00

posixregex.c

regex lint

2015-04-13 17:21:59 -07:00

random.c

Another batch of manual header var additions

2015-03-17 18:45:43 +02:00

tclib.c

Bulk recovery of file CVS headers and addition of NHDT- headers.

2015-03-17 18:45:12 +02:00

termcap

*** empty log message ***

2002-01-05 21:05:58 +00:00

termcap.uu

*** empty log message ***

2002-01-05 21:05:58 +00:00

unixtty.c

Make LOADSYMSETS unconditional.

2015-03-17 18:46:39 +02:00

uudecode.c

Another batch of manual header var additions

2015-03-17 18:45:43 +02:00