Merge branch 'master' into context

2025-07-04 20:18:47 +02:00 · 2018-01-31 16:02:26 +01:00
parent f3776055d6 cd3dd886de
commit 27980d9688
58 changed files with 475 additions and 346 deletions
--- a/examples/null_example/main.cpp
+++ b/examples/null_example/main.cpp
@ -1,5 +1,5 @@
 // ImGui - null/dummy example application (compile and link imgui with no inputs, no outputs)
-#include <imgui.h>
+#include "imgui.h"
 #include <stdio.h>

 int main(int, char**)