Merge branch 'master' into context

This commit is contained in:
omar
2018-01-31 16:02:26 +01:00
58 changed files with 475 additions and 346 deletions

View File

@ -12,7 +12,7 @@
#include <stdint.h> // uint64_t
#include <cstring> // memcpy
#include <imgui.h>
#include "imgui.h"
#include "imgui_impl_a5.h"
#include <allegro5/allegro.h>
#include <allegro5/allegro_primitives.h>