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

…

.gitattributes

…

dgn_comp.h

…

dgn_lex.c

…

dgn_yacc.c

…

ioctl.c

…

lev_comp.h

…

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

…

NetHack.cnf

Add menucolors

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

nhlan.c

…

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

…

pcunix.c

nhclose

2015-04-06 10:12:10 -04:00

random.c

…

tclib.c

…

termcap

…

termcap.uu

…

unixtty.c

…

uudecode.c

…