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

..

amiga

Make GOLDOBJ unconditional.

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

atari

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

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

be

Make WIZARD unconditional.

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

mac

Make WIZARD unconditional.

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

msdos

Make a few fixes to code that was confusing indent

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

os2

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

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

share

Changes for Win32; update precompiled files

2015-03-20 15:14:31 +02:00

unix

Move some hard-coded string arrays into data files.

2015-03-18 22:05:10 +02:00

vms

Make LOADSYMSETS unconditional.

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

wince

Manually fix botched NHDT-Branch expansions.

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

winnt

Merge branch 'master' into paxed-new_lev_comp

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