Pasi Kallinen
2649cb385c
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
2015-03-21 19:39:48 +02:00
..
2015-03-17 18:44:59 +02:00
2015-03-18 19:24:43 -07:00
2015-03-17 18:52:49 +02:00
2015-03-17 18:52:49 +02:00
2015-03-17 18:52:49 +02:00
2015-03-19 18:43:35 +02:00
2015-03-17 18:52:49 +02:00
2015-03-17 18:52:49 +02:00
2015-03-17 18:47:20 +02:00
2015-03-17 18:47:16 +02:00
2015-03-17 18:46:08 +02:00
2015-03-17 18:52:49 +02:00
2015-03-19 21:13:24 +02:00
2015-03-19 22:01:16 +02:00
2015-03-17 18:52:49 +02:00
2015-03-17 18:52:49 +02:00
2015-03-17 18:47:20 +02:00
2015-03-17 18:47:20 +02:00
2015-03-17 22:40:57 -04:00
2015-03-17 18:52:49 +02:00
2015-03-17 18:52:49 +02:00
2002-01-05 21:05:46 +00:00
2015-03-17 18:52:49 +02:00
2015-03-20 15:14:31 +02:00
2015-03-17 18:52:49 +02:00
2015-03-17 18:46:53 +02:00
2015-03-17 18:52:49 +02:00
2015-03-17 18:45:58 +02:00
2015-03-17 18:52:49 +02:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:52:49 +02:00
2015-03-17 18:52:49 +02:00
2002-08-24 15:33:00 +00:00
2003-09-18 03:03:12 +00:00
2015-03-17 18:52:49 +02:00
2015-03-17 18:57:39 +02:00
2015-03-17 18:46:45 +02:00
2015-03-17 18:52:49 +02:00
2015-03-17 18:57:39 +02:00
2015-03-17 18:57:39 +02:00
2015-03-17 18:52:49 +02:00
2011-12-05 09:39:19 +00:00
2015-03-17 18:52:49 +02:00