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		2018-09-04 11:13:20 +03:00
..
android	android build fix	2018-09-03 20:54:07 +03:00
html	prepare .70.6	2018-09-03 01:06:02 +03:00
macosx	prepare .70.6	2018-09-03 01:06:02 +03:00
uwp	Update version number for uwp and macosx	2018-08-16 10:58:58 +08:00
windows	Merge branch '#320'	2018-09-04 11:13:20 +03:00