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

16 KiB

Raw Blame History

View Raw