Pasi Kallinen 2649cb385c Merge branch 'master' into paxed-new_lev_comp ...

Conflicts:
	.gitignore
	doc/fixes35.0
	include/obj.h
	include/patchlevel.h
	src/dig.c
	src/mklev.c
	src/rumors.c
	src/save.c
	src/topten.c
	src/trap.c
	sys/winnt/Makefile.msc
	util/makedefs.c
	win/win32/levstuff.mak

2015-03-21 19:39:48 +02: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

Manually fix botched NHDT-Branch expansions.

2015-03-17 18:46:55 +02: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

Manually fix botched NHDT-Branch expansions.

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

tty

DEBUG/debugpline() fixup

2015-03-17 18:47:31 +02:00

win32

Merge branch 'master' into paxed-new_lev_comp

2015-03-21 19:39:48 +02:00

X11

Manually fix botched NHDT-Branch expansions.

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