nhmall
77dd76ed17
Merge branch 'master' into win32-x64-working
Resolved Conflicts:
src/cmd.c
src/mkobj.c
All conflicts fixed but you are still merging.
Changes to be committed:
modified: dat/Priest.des
modified: dat/Rogue.des
modified: dat/Valkyrie.des
modified: dat/Wizard.des
modified: dat/gehennom.des
modified: src/cmd.c
modified: src/mkobj.c
modified: src/steal.c
modified: sys/share/lev_yacc.c
modified: util/lev_comp.y
2015-05-02 13:53:08 -04:00
..
2015-03-31 09:50:02 -04:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:46:17 +02:00
2015-03-31 09:50:02 -04:00
2015-04-05 23:42:15 -04:00
2015-03-31 09:50:02 -04:00
2015-05-02 13:53:08 -04:00
2015-04-12 11:58:14 -04:00
2015-03-31 09:50:02 -04:00
2015-04-05 23:42:15 -04:00
2015-05-02 14:02:10 +02:00