Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives

This commit is contained in:
ocornut
2015-07-08 17:08:51 -06:00
3 changed files with 4 additions and 4 deletions

View File

@@ -1,4 +1,4 @@
// ImGui library v1.42 wip
// ImGui library v1.42
// See ImGui::ShowTestWindow() for sample code.
// Read 'Programmer guide' below for notes on how to setup ImGui in your codebase.
// Get latest version at https://github.com/ocornut/imgui