Merge remote-tracking branch 'refs/remotes/origin/master' into gui

This commit is contained in:
Lynix
2016-10-27 18:36:47 +02:00
179 changed files with 5443 additions and 2071 deletions

View File

@@ -13,7 +13,8 @@ EXAMPLE.Libraries = {
"NazaraLua",
"NazaraNetwork",
"NazaraNoise",
"NazaraPhysics",
"NazaraPhysics2D",
"NazaraPhysics3D",
"NazaraRenderer",
"NazaraUtility",
"NazaraSDK"

View File

@@ -4,7 +4,8 @@
#include <Nazara/Lua.hpp>
#include <Nazara/Network.hpp>
#include <Nazara/Noise.hpp>
#include <Nazara/Physics.hpp>
#include <Nazara/Physics2D.hpp>
#include <Nazara/Physics3D.hpp>
#include <Nazara/Renderer.hpp>
#include <Nazara/Utility.hpp>
#include <NDK/Application.hpp>
@@ -19,4 +20,4 @@ int main(int argc, char* argv[])
// Do what you want here
return EXIT_SUCCESS;
}
}