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
This commit is contained in:
@@ -14,10 +14,10 @@
|
||||
* Incrementing EDITLEVEL can be used to force invalidation of old bones
|
||||
* and save files.
|
||||
*/
|
||||
#define EDITLEVEL 56
|
||||
#define EDITLEVEL 58
|
||||
|
||||
#define COPYRIGHT_BANNER_A \
|
||||
"NetHack, Copyright 1985-2012"
|
||||
"NetHack, Copyright 1985-2015"
|
||||
#define COPYRIGHT_BANNER_B \
|
||||
" By Stichting Mathematisch Centrum and M. Stephenson."
|
||||
/* COPYRIGHT_BANNER_C is generated by makedefs into date.h */
|
||||
|
||||
Reference in New Issue
Block a user