nhmall 83a7513c13 Merge branch 'master' into win32-x64-working ...

Conflicts:
	src/do_name.c
	src/trap.c
	src/zap.c
	win/X11/winmenu.c

2015-04-12 10:35:00 -04:00

..

amiga

NHDT substitution version 2.

2015-03-31 09:50:02 -04:00

atari

pull in the recent unconditionals merge from master

2015-02-27 21:25:00 -05:00

be

pull in the recent unconditionals merge from master

2015-02-27 21:25:00 -05:00

mac

NHDT substitution version 2.

2015-03-31 09:50:02 -04:00

msdos

Merge branch 'master' into win32-x64-working

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

os2

NHDT substitution version 2.

2015-03-31 09:50:02 -04:00

share

Merge branch 'master' into win32-x64-working

2015-04-12 00:15:40 -04:00

unix

Merge branch 'master' into win32-x64-working

2015-04-12 10:35:00 -04:00

vms

NHDT substitution version 2.

2015-03-31 09:50:02 -04:00

wince

Merge branch 'master' into win32-x64-working

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

winnt

Merge branch 'master' into win32-x64-working

2015-04-12 10:35:00 -04:00