From: Pasi Kallinen <paxed@alt.org>
Date: Tue, 24 Mar 2015 17:59:40 +0000 (+0200)
Subject: Merge branch 'paxed-new_lev_comp' of https://rodney.nethack.org:20040/git/NHsource... 
X-Git-Tag: NetHack-3.6.0_RC01~492^2~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2d6f9686a7901d962a52104fedc32e7b579ea667;p=nethack

Merge branch 'paxed-new_lev_comp' of https://rodney.nethack.org:20040/git/NHsource into paxed-new_lev_comp

Conflicts:
	include/obj.h
	include/patchlevel.h
	src/topten.c
	src/trap.c
	sys/winnt/Makefile.msc
---

2d6f9686a7901d962a52104fedc32e7b579ea667