nhmall
3d3ee78a0b
Merge branch 'master' into win32-x64-working
Conflicts:
src/files.c
src/potion.c
sys/winnt/Makefile.msc
Changes to be committed:
modified: .gitignore
modified: DEVEL/hooksdir/nhsub
modified: dat/.gitignore
modified: dat/opthelp
modified: doc/Guidebook.mn
modified: doc/Guidebook.tex
modified: doc/fixes35.0
modified: include/context.h
modified: include/decl.h
modified: include/extern.h
modified: include/flag.h
modified: include/hack.h
modified: include/patchlevel.h
modified: src/apply.c
modified: src/attrib.c
modified: src/decl.c
modified: src/do.c
modified: src/do_name.c
modified: src/dothrow.c
modified: src/eat.c
modified: src/files.c
modified: src/hack.c
modified: src/invent.c
modified: src/lock.c
modified: src/mklev.c
modified: src/mondata.c
modified: src/monmove.c
modified: src/music.c
modified: src/options.c
modified: src/potion.c
modified: src/pray.c
modified: src/sit.c
modified: src/sp_lev.c
modified: src/uhitm.c
modified: sys/share/posixregex.c
modified: sys/winnt/Makefile.msc
modified: util/.gitignore
modified: win/win32/vs2010/NetHackW.vcxproj
2015-04-14 18:23:48 -04:00
..
2015-03-31 00:18:00 -07:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:46:01 +02:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:45:12 +02:00
2002-01-05 21:05:47 +00:00
2015-03-17 18:45:12 +02:00
2015-04-12 11:46:54 -04:00
2015-03-17 18:45:12 +02:00
2015-04-12 11:46:26 -04:00
2015-04-13 21:11:44 +03:00
2015-03-17 18:45:12 +02:00
2015-04-14 18:23:48 -04:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:46:49 +02:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:46:12 +02:00
2015-03-17 18:45:12 +02:00
2015-04-14 19:41:44 +03:00
2015-04-14 18:23:48 -04:00
2015-03-17 18:45:12 +02:00
2002-01-05 21:05:47 +00:00
2015-03-20 00:58:29 -04:00
2015-04-14 18:23:48 -04:00
2015-03-17 18:45:12 +02:00
2002-01-05 21:05:47 +00:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:46:35 +02:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:52:42 +02:00
2015-03-17 18:46:32 +02:00
2015-03-17 18:46:35 +02:00
2015-03-17 18:46:35 +02:00
2015-03-17 18:46:23 +02:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:45:12 +02:00
2015-04-05 23:42:15 -04:00
2015-04-12 10:02:17 -04:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:46:41 +02:00
2015-04-13 21:11:44 +03:00
2015-03-17 18:46:41 +02:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:46:01 +02:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:45:12 +02:00
2002-01-05 21:05:48 +00:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:45:12 +02:00
2015-04-09 13:27:44 -04:00
2015-03-17 18:45:49 +02:00
2015-04-10 01:39:55 -07:00
2015-03-17 18:45:12 +02:00
2015-04-12 00:15:40 -04:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:45:12 +02:00
2015-04-10 01:39:55 -07:00
2015-03-17 18:46:17 +02:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:47:17 +02:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:46:41 +02:00
2015-04-05 23:42:15 -04:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:45:12 +02:00
2015-03-29 15:51:11 +03:00
2015-03-17 18:47:14 +02:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:45:12 +02:00
2015-04-02 13:06:45 +03:00
2015-03-30 22:12:54 +03:00