AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 04:27:42 +00:00
Code Issues Projects Releases Wiki Activity

Complete merge

Browse Source
This commit is contained in:
Jack Andersen
2016-09-16 10:23:07 -10:00
parent 32be061783
commit dae5ea06f5
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Runtime/MP1/CTweaks.cpp
View File

@@ -10,11 +10,8 @@
#include "DataSpec/DNAMP1/Tweaks/CTweakPlayerControl.hpp"
#include "DataSpec/DNAMP1/Tweaks/CTweakGunRes.hpp"
#include "DataSpec/DNAMP1/Tweaks/CTweakPlayerRes.hpp"
<<<<<<< HEAD
#include "DataSpec/DNAMP1/Tweaks/CTweakSlideShow.hpp"
=======
#include "World/CPlayerCameraBob.hpp"
>>>>>>> b27821c5eb1c9eb5b69acda11ab77c7cda018ca9
namespace urde
{