Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource into paxed-new_lev_comp
Conflicts: doc/fixes35.0 include/extern.h include/ntconf.h include/obj.h include/patchlevel.h src/dig.c src/do.c src/files.c src/fountain.c src/mklev.c src/objnam.c src/options.c src/potion.c src/rumors.c src/save.c src/topten.c src/trap.c src/wield.c sys/share/pcmain.c sys/unix/unixmain.c sys/winnt/Makefile.msc util/lev_main.c util/makedefs.c
This commit is contained in:
+1
-1
@@ -1,4 +1,4 @@
|
||||
/* NetHack 3.5 lev_main.c $NHDT-Date: 1427161270 2015/03/24 01:41:10 $ $NHDT-Branch: paxed-new_lev_comp-B $:$NHDT-Revision: 1.30 $ */
|
||||
/* NetHack 3.5 lev_main.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 lev_main.c $Date: 2012/01/12 04:48:12 $ $Revision: 1.20 $ */
|
||||
/* SCCS Id: @(#)lev_main.c 3.5 2007/01/17 */
|
||||
/* Copyright (c) 1989 by Jean-Christophe Collet */
|
||||
|
||||
Reference in New Issue
Block a user