Merge branch 'sdl2'
authorSteve Melenchuk <smelenchuk@gmail.com>
Thu, 20 Nov 2014 04:34:42 +0000 (21:34 -0700)
committerSteve Melenchuk <smelenchuk@gmail.com>
Thu, 20 Nov 2014 04:34:42 +0000 (21:34 -0700)
commit6680ffd2a1d48a01939f376acacecf0cbcebadf6
tree67dacde5a9cb541ebe4578ebfc847a921e889818
parent1dd04fe14d8c7f2ad9711eaca84b931aebb53780
parent1a4659355f61c5ef6ced30e0b24894106f12f7f4
Merge branch 'sdl2'

All of the major TODOs are done. It's high time we get a modern tiles
port... and a modern Android port.

Yay. Hooray.

Conflicts:
crawl-ref/source/Makefile
crawl-ref/source/message.cc
25 files changed:
.travis.yml
crawl-ref/INSTALL.txt
crawl-ref/source/Makefile
crawl-ref/source/butcher.cc
crawl-ref/source/database.cc
crawl-ref/source/dbg-asrt.cc
crawl-ref/source/defines.h
crawl-ref/source/describe.cc
crawl-ref/source/enum.h
crawl-ref/source/files.cc
crawl-ref/source/fontwrapper-ft.cc
crawl-ref/source/hints.cc
crawl-ref/source/hiscores.cc
crawl-ref/source/libgui.cc
crawl-ref/source/libutil.cc
crawl-ref/source/macro.cc
crawl-ref/source/main.cc
crawl-ref/source/menu.cc
crawl-ref/source/message.cc
crawl-ref/source/prompt.cc
crawl-ref/source/skill_menu.cc
crawl-ref/source/startup.cc
crawl-ref/source/tilepick.cc
crawl-ref/source/tilesdl.cc
crawl-ref/source/viewmap.cc