nhmall
3969eb2af1
Merge branch 'master' into win32-x64-working
Conflicts:
src/mon.c
Changes to be committed:
modified: DEVEL/Developer.txt
modified: dat/endgame.des
modified: include/patchlevel.h
modified: include/you.h
modified: src/mon.c
modified: src/sounds.c
modified: src/spell.c
modified: src/vault.c
modified: win/share/tiletext.c
2015-04-21 06:39:52 -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-18 17:47:14 -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-20 00:58:29 -04:00
2015-04-15 18:30:13 -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-20 00:05:00 -07: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-20 00:05:00 -07:00
2015-03-30 22:12:54 +03:00