Vadim Grigoruk
b41b0436ab
Merge branch '#320'
# Conflicts:
# .gitignore
# .travis.yml
# Makefile
# bin/assets/config.tic.dat
# bin/assets/fenneldemo.tic.dat
# bin/assets/tic.js.dat
# build.sh
# build/windows/example/example.vcxproj
# build/windows/sdl-gpu/sdl-gpu.vcxproj
# build/windows/studio/studio.vcxproj
# build/windows/tic/tic.aps
# build/windows/tic/tic.rc
# build/windows/tic80/tic80.vcxproj
# build/windows/zlib/zlib.vcxproj
# build/windows/zlib/zlib.vcxproj.filters
# include/tic80_config.h