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

16 KiB

Raw Blame History

View Raw