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-17 18:45:12 +02:00
2015-03-17 18:45:43 +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-21 19:39:48 +02:00
2005-01-02 17:21:18 +00:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:45:12 +02:00
2002-02-12 23:00:27 +00:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:45:40 +02:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:46:45 +02:00
2003-03-15 12:33:57 +00:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:46:17 +02:00