Derek S. Ray 7c644c1507 Merge branch 'win32-x64-working' of https://rodney.nethack.org:20040/git/NHsource into win32-x64-working ...

* 'win32-x64-working' of https://rodney.nethack.org:20040/git/NHsource: (27 commits)
  Makefile bit
  gcc Makefile updates for recent file additions
  ...

Conflicts:
	src/files.c

2015-04-15 18:30:13 -04:00

..

chain

pull in the recent unconditionals merge from master

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

gem

pull in the recent unconditionals merge from master

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

gnome

Merge branch 'master' into win32-x64-working

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

macosx

pull in the recent unconditionals merge from master

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

Qt

Remove last mention of EXP_ON_BOTL

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

share

Merge branch 'master' into win32-x64-working

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

tty

Merge branch 'master' into win32-x64-working

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

win32

Merge branch 'win32-x64-working' of https://rodney.nethack.org:20040/git/NHsource into win32-x64-working

2015-04-15 18:30:13 -04:00

X11

Merge branch 'master' into win32-x64-working

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