From github.com:liballeg/allegro5 53bb118c1..4d9123560 master -> origin/master Updating 53bb118c1..4d9123560 Fast-forward .travis.yml | 2 +- addons/acodec/voc.c | 2 +- addons/audio/kcm_stream.c | 2 +- docs/src/refman/direct3d.txt | 4 +- docs/src/refman/display.txt | 2 +- docs/src/refman/events.txt | 4 +- docs/src/refman/fshook.txt | 2 +- docs/src/refman/haptic.txt | 10 +- docs/src/refman/native_dialog.txt | 2 +- examples/ex_bitmap.c | 2 +- include/allegro5/internal/aintern_convert.h | 12 +- misc/make_mixer_helpers.py | 4 +- misc/make_scanline_drawers.py | 4 +- misc/regenerate.sh | 6 +- misc/sf-cf.py | 2 +- src/file.c | 4 +- src/scanline_drawers.inc | 5474 +++++++++++++-------------- src/win/whaptic.cpp | 2 +- 18 files changed, 2579 insertions(+), 2961 deletions(-)