zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-06-02 10:11:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Resolve merge issues

Browse source 
# Conflicts:
#	GNUmakefile
#	platform/Windows/eduke32.sln
#	platform/Windows/props/build_common.props
#	source/audiolib/include/music.h
#	source/blood/src/blood.cpp
#	source/blood/src/gui.cpp
#	source/blood/src/mapedit.cpp
#	source/blood/src/sound.cpp
#	source/build/include/vfs.h
#	source/build/src/vfs.cpp
This commit is contained in:
nukeykt 2019-10-24 22:25:34 +09:00 • committed by Christoph Oelckers
parent 4ca1af72c3
commit e6f53f7c30
24 changed files with 162 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

2
source/libsmackerdec/include/FileStream.h
View file

@ -21,7 +21,7 @@
#define _SmackerFileStream_h_
#include <string>
#include "cache1d.h"
#include "vfs.h"
#include "compat.h"
#include <stdint.h>