BADIM-PC\Vadim 95fe3d3b98 Merge branch 'master' into UWP_GLES2 ...

Conflicts:
	.gitignore

2018-02-21 21:07:07 +03:00

..

android

Preprocessor definitions to build with/without lua/moon/js/wren #529

2018-02-16 15:43:30 +03:00

html

added prebuilt JS version

2018-02-10 11:08:14 +03:00

macosx

.60.3 hotfix

2018-01-13 15:16:03 +03:00

mingw

update to SDL 2.0.7 #502

2018-01-10 16:05:49 +03:00

uwp

sdl-gpu as statoc lib for UWP

2018-02-21 20:53:49 +03:00

windows

Merge branch 'master' into UWP_GLES2

2018-02-21 21:07:07 +03:00