merged.
Merge branch 'master' of github.com:ShotaX/dcss_ja
Merge branch 'master' of https://github.com/dis-/dcss_ja
Merge pull request #5 from dis-/refactor_abl_show

abl-show.cc及び該当のjtrans.txtの修正
Merge branch 'master' of github.com:ShotaX/dcss_ja
refactor abl-show
refactor abl-show
Merge branch 'refactor_abl_show' of github.com:dis-/dcss_ja into refactor_abl_show
fix encoding
refactor abl-show
Merge branch 'refactor_abl_show' of github.com:dis-/dcss_ja into refactor_abl_show

Conflicts:
	crawl/source/abl-show.cc
update exefile
refactor message of abyss.cc, areas.cc, actor.cc
refactor arena art-func attack
fix encoding
Merge branch 'master' into refactor_abyss

Conflicts:
	crawl/dat/database/ja/jtrans_artifact_abi.txt
	crawl/source/database.cc
	crawl/source/libw32c.cc