Christoph Oelckers ba5b8b3d6f Merge commit '2f696e1a95997f2969d1ddb49cd2827bde58479f' into whaven ... # Conflicts: # source/core/gameinput.h		2021-04-19 13:11:41 +02:00
..
build	Merge commit 'e89761d2d526581e4599f564b26a6eb983fd92ec' into whaven	2021-04-17 14:59:12 +02:00
common	Merge commit '2f696e1a95997f2969d1ddb49cd2827bde58479f' into whaven	2021-04-19 13:11:41 +02:00
core	Merge commit '2f696e1a95997f2969d1ddb49cd2827bde58479f' into whaven	2021-04-19 13:11:41 +02:00
games	Merge commit '2f696e1a95997f2969d1ddb49cd2827bde58479f' into whaven	2021-04-19 13:11:41 +02:00
glbackend	Merge branch 'master' into newrenderer2	2021-04-11 14:38:56 +02:00
libsmackerdec	- fixed the noisiest value truncation warnings after shortly re-enabling them in the compiler, plus a few places where the warning pointed to incorrect code.	2020-09-26 11:59:24 +02:00
platform	- Remove leftover Ion Fury stuffs causing log errors like "Script error, 'D:/Program Files (x86)/Steam/steamapps/common/Ion Fury/fury.grpinfo" line 10: Warning: GRP without game defined. Ignoring'".	2020-09-25 18:06:06 +10:00
thirdparty	- macOS backend update, plus moving base64.cpp around.	2020-09-27 16:12:50 +02:00
CMakeLists.txt	Merge commit 'e89761d2d526581e4599f564b26a6eb983fd92ec' into whaven	2021-04-17 14:59:12 +02:00
g_pch.h
gitinfo.cpp