Commit 3a742853 authored Jan 03, 2017 by DarkGod

plop

Merge branch 'master' into gamepad_dev

Conflicts:
	src/core_lua.c

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Please to comment