Christoph Oelckers
|
b473fc936c
|
- consolidated the 3 atterm implementations.
Each platform had its own copy. Why?
# Conflicts:
# src/CMakeLists.txt
# src/dobjtype.cpp
# src/g_mapinfo.cpp
# src/g_statusbar/sbarinfo.cpp
# src/i_net.cpp
# src/menu/menudef.cpp
# src/p_setup.cpp
# src/posix/cocoa/i_video.mm
# src/posix/i_system.h
# src/posix/sdl/i_main.cpp
# src/r_utility.cpp
# src/s_advsound.cpp
# src/s_sound.cpp
# src/v_video.cpp
# src/win32/i_input.cpp
# src/win32/i_system.h
# Conflicts:
# src/CMakeLists.txt
# src/doomtype.h
# src/i_net.cpp
# src/posix/sdl/i_system.cpp
# src/win32/i_system.cpp
# src/win32/win32video.cpp
|
2019-06-10 20:52:02 +02:00 |
|