mirror of
https://github.com/UberGames/lilium-voyager.git
synced 2024-12-14 06:01:10 +00:00
4837f4619e
Conflicts: code/client/cl_main.c code/qcommon/common.c code/qcommon/files.c code/qcommon/msg.c code/qcommon/q_shared.h code/renderercommon/tr_common.h code/renderergl2/tr_extensions.c code/sdl/sdl_glimp.c |
||
---|---|---|
.. | ||
con_log.c | ||
con_passive.c | ||
con_tty.c | ||
con_win32.c | ||
sys_autoupdater.c | ||
sys_loadlib.h | ||
sys_local.h | ||
sys_main.c | ||
sys_osx.m | ||
sys_unix.c | ||
sys_win32.c | ||
win_manifest.xml | ||
win_resource.h | ||
win_resource.rc |