nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'master' into win32-x64-working

Browse Source 
Conflicts:
	include/flag.h
This commit is contained in:
nhmall
2015-06-16 06:34:05 -04:00
parent fccf0e8c23 b33c3381e6
commit 833d308c7e
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/flag.h
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 flag.h $NHDT-Date: 1434024828 2015/06/11 12:13:48 $ $NHDT-Branch: win32-x64-working $:$NHDT-Revision: 1.87 $ */
/* NetHack 3.6 flag.h $NHDT-Date: 1434450203 2015/06/16 10:23:23 $ $NHDT-Branch: master $:$NHDT-Revision: 1.87 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */

2
src/display.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 display.c $NHDT-Date: 1434447701 2015/06/16 09:41:41 $ $NHDT-Branch: master $:$NHDT-Revision: 1.63 $ */
/* NetHack 3.6 display.c $NHDT-Date: 1434450195 2015/06/16 10:23:15 $ $NHDT-Branch: master $:$NHDT-Revision: 1.64 $ */
/* Copyright (c) Dean Luick, with acknowledgements to Kevin Darcy */
/* and Dave Cohrs, 1990. */
/* NetHack may be freely redistributed. See license for details. */

2
sys/share/cppregex.cpp
View File

@@ -10,7 +10,7 @@
extern "C" {
#include <hack.h>
const char regex_id[] = "cppregex";
char regex_id[] = "cppregex";
struct nhregex {
std::unique_ptr<std::regex> re;