Merge commit 'nc/master' into temp
authorMark Wooding <mdw@distorted.org.uk>
Sat, 12 May 2007 23:03:44 +0000 (00:03 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Sat, 12 May 2007 23:03:44 +0000 (00:03 +0100)
commitda704ab3e5163297d581bf4d06fd3a31dbdc42fe
tree60961a6b9418ebc4e92cedca2b9700c277033f11
parent4005b3424e2f89eba44b1dda567a6e0cd7b452a0
parentac6c07c4feeaea33c25b4696bbcb6b27e594624c
Merge commit 'nc/master' into temp

* commit 'nc/master':
  Updates

Conflicts:

dice.lisp
monsters.tex
spells.tex
tables.cls
treasure.tex
dice.lisp
monsters.tex
spells.tex
treasure.tex