2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 11:07:44 +00:00

Merge branch 'master' of ssh://gitlab.axiodl.com:6431/AxioDL/urde

This commit is contained in:
Jack Andersen
2018-01-13 20:44:50 -10:00
4 changed files with 4 additions and 4 deletions

View File

@@ -6,7 +6,7 @@
#include <type_traits> #include <type_traits>
#include <cstdlib> #include <cstdlib>
#include "optional.hpp" #include "optional.hpp"
#include <logvisor/logvisor.hpp> #include "logvisor/logvisor.hpp"
namespace rstl namespace rstl
{ {

2
amuse

Submodule amuse updated: f37296d560...8f94bdd488

View File

@@ -1,5 +1,5 @@
#include "VISIBuilder.hpp" #include "VISIBuilder.hpp"
#include <logvisor/logvisor.hpp> #include "logvisor/logvisor.hpp"
#ifndef _WIN32 #ifndef _WIN32
#include <unistd.h> #include <unistd.h>

View File

@@ -3,7 +3,7 @@
#include "zeus/CAABox.hpp" #include "zeus/CAABox.hpp"
#include "VISIBuilder.hpp" #include "VISIBuilder.hpp"
#include "zeus/CFrustum.hpp" #include "zeus/CFrustum.hpp"
#include <logvisor/logvisor.hpp> #include "logvisor/logvisor.hpp"
static logvisor::Module Log("visigen"); static logvisor::Module Log("visigen");