Merge branch 'master' into navigation

This commit is contained in:
omar
2018-01-29 17:42:39 +01:00
26 changed files with 89 additions and 74 deletions

View File

@ -1,7 +1,7 @@
// ImGui - standalone example application for DirectX 11
// If you are new to ImGui, see examples/README.txt and documentation at the top of imgui.cpp.
#include <imgui.h>
#include "imgui.h"
#include "imgui_impl_dx11.h"
#include <d3d11.h>
#define DIRECTINPUT_VERSION 0x0800