mirror of
				https://github.com/ocornut/imgui.git
				synced 2025-10-26 12:27:30 +00:00 
			
		
		
		
	Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts: imgui.cpp
This commit is contained in:
		| @@ -1,6 +1,6 @@ | ||||
| // ImGui Allegro 5 bindings | ||||
| // https://github.com/ocornut/imgui | ||||
| // by @birthggd, public domain | ||||
| // by @birthggd | ||||
|  | ||||
| #include <stdint.h>     // uint64_t | ||||
| #include <cstring>      // memcpy | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 ocornut
					ocornut