]> granicus.if.org Git - nethack/commitdiff
projects / nethack / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0a9248c e554cba)
Merge branch 'paxed-new_lev_comp' of https://rodney.nethack.org:20040/git/NHsource...
authorPasi Kallinen <paxed@alt.org>
Tue, 24 Mar 2015 17:59:40 +0000 (19:59 +0200)
committerPasi Kallinen <paxed@alt.org>
Tue, 24 Mar 2015 17:59:40 +0000 (19:59 +0200)
Conflicts:
include/obj.h
include/patchlevel.h
src/topten.c
src/trap.c
sys/winnt/Makefile.msc

1  2 
include/ntconf.h patch | diff1 | diff2 | blob | history
sys/winnt/Makefile.msc patch | diff1 | diff2 | blob | history

diff --cc include/ntconf.h
Simple merge
diff --cc sys/winnt/Makefile.msc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.