Derek S. Ray 32619fa8cc Merge branch 'master' into derek-farming ...

Reverse merge before final reintegration.

* master: (40 commits)
  Fix magic mapped dark room symbols
  Disclose extinct species alongside genocided ones
  ...

Conflicts:
	doc/fixes35.0
	src/do.c
	src/files.c
	src/invent.c
	src/objnam.c
	sys/share/pcmain.c

2015-04-10 16:56:30 -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

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 precompiled lex and yacc files

2015-04-10 19:45:04 +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

Merge branch 'master' into derek-farming

2015-04-10 16:56:30 -04:00

pcsys.c

nhclose

2015-04-06 10:12:10 -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

nhclose

2015-04-06 10:12:10 -04: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