nhmall 1ef94c890f Merge branch 'master' into win32-x64-working ...

Conflicts:
	include/hack.h
	win/X11/winmenu.c
	win/X11/winstat.c

2015-05-06 19:53:26 -04:00

..

chain

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

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

gem

Make GOLDOBJ unconditional.

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

gnome

Merge branch 'master' into win32-x64-working

2015-04-05 23:42:15 -04:00

macosx

Fix lost mode bits.

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

Qt

Remove last mention of EXP_ON_BOTL

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

share

tiles lint

2015-05-03 01:03:24 -07:00

tty

Merge branch 'master' into win32-x64-working

2015-04-26 08:39:18 -04:00

win32

cherry-pick the YACC/LEX upgrades from elsewhere

2015-05-06 17:55:50 -04:00

X11

Merge branch 'master' into win32-x64-working

2015-05-06 19:53:26 -04:00