Derek S. Ray 335c7fc003 Merge branch 'master' into derek-farming ...

* master: (49 commits)
  Fix 'fetch' syntax, include sparkly 'git log' trick
  Show object symbols in menu headings
  Fix a memory leak on termination.
  ...

Conflicts:
	include/obj.h
	src/do.c
	src/files.c
	src/hack.c
	src/invent.c
	src/mkobj.c
	src/mon.c
	src/objnam.c

2015-03-25 17:23:59 -04:00

..

chain

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

2015-02-26 09:19:03 -05:00

gem

Make GOLDOBJ unconditional.

2015-02-27 19:33:40 -05:00

gnome

Manually fix botched NHDT-Branch expansions.

2015-03-01 20:32:28 -05:00

macosx

Fix lost mode bits.

2015-02-26 09:22:52 -05:00

Qt

Remove last mention of EXP_ON_BOTL

2015-03-01 10:26:24 +02:00

share

pull the globs outside the Meaty Sequence

2015-03-20 11:37:50 -04:00

tty

DEBUG/debugpline() fixup

2015-03-15 18:02:26 -07:00

win32

Make GOLDOBJ unconditional.

2015-02-27 19:33:40 -05:00

X11

Manually fix botched NHDT-Branch expansions.

2015-03-01 20:32:28 -05:00