]> granicus.if.org Git - nethack/commit
projects / nethack / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 222b4c0 9c8f4d1)
Merge branch 'derek-elbereth'
authorDerek S. Ray <derekray@gmail.com>
Sat, 9 May 2015 15:58:36 +0000 (11:58 -0400)
committerDerek S. Ray <derekray@gmail.com>
Sat, 9 May 2015 15:58:36 +0000 (11:58 -0400)
commitd0fb68795d265aa6bc52cd4e4eb5333f4c3a96a8
tree9e989ff93f2e42189eb4d1b50b2b872f1c16e50dtree | snapshot
parent222b4c002370c738fba5e0552f9131581391742acommit | diff
parent9c8f4d1fadf642d3c53bbace344fee59bbd70d5acommit | diff
Merge branch 'derek-elbereth'

* derek-elbereth:
  ensure that the 'safe' objects remain safe
  finish up the changes to trigger erosion on use
  initial pass for toning down Elbereth

Conflicts:
dat/castle.des
dat/sokoban.des
include/extern.h
src/engrave.c
src/mklev.c
src/monmove.c
src/zap.c
dat/castle.des diff1 | diff2 | blob | history
dat/sokoban.des diff1 | diff2 | blob | history
include/extern.h diff1 | diff2 | blob | history
src/engrave.c diff1 | diff2 | blob | history
src/mklev.c diff1 | diff2 | blob | history
src/monmove.c diff1 | diff2 | blob | history
src/zap.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.