granicus.if.org Git - nethack/commit

]> granicus.if.org Git - nethack/commit

projects / nethack / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 2d6f968 d3205d9)

author	Pasi Kallinen <paxed@alt.org>
	Wed, 1 Apr 2015 13:09:53 +0000 (16:09 +0300)
committer	Pasi Kallinen <paxed@alt.org>
	Wed, 1 Apr 2015 13:09:53 +0000 (16:09 +0300)
commit	323b8b40386d8c8a4adc1a8dc2298aa40e30dda0
tree	62ae4679be22f9057ec5fd933975b407fdbb0def	tree \| snapshot
parent	2d6f9686a7901d962a52104fedc32e7b579ea667	commit \| diff
parent	d3205d98d648a890135b8e07119c9302f35a8ca7	commit \| diff

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

Conflicts:
src/trap.c
sys/winnt/Makefile.msc

.gitignore	diff1 \|	diff2 \|	blob \| history
dat/endgame.des	diff1 \|	diff2 \|	blob \| history
include/extern.h	diff1 \|	diff2 \|	blob \| history
include/obj.h	diff1 \|	diff2 \|	blob \| history
include/patchlevel.h	diff1 \|	diff2 \|	blob \| history
src/dig.c	diff1 \|	diff2 \|	blob \| history
src/mkmaze.c	diff1 \|	diff2 \|	blob \| history
src/mon.c	diff1 \|	diff2 \|	blob \| history
src/topten.c	diff1 \|	diff2 \|	blob \| history
src/trap.c	diff1 \|	diff2 \|	blob \| history
sys/winnt/Makefile.msc	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.