omar 807322c9a5 Merge branch 'master' into navigation ...

# Conflicts:
#	imgui.cpp

2017-08-26 18:43:10 +08:00

..

build_win32.bat

Examples: Renaming opengl_example/ to opengl2_example/ for clarity (1/2 because git)

2016-08-25 10:25:51 +02:00

imgui_impl_glfw.cpp

Merge branch 'master' into navigation

2017-08-26 18:43:10 +08:00

imgui_impl_glfw.h

Examples: Renaming opengl_example/ to opengl2_example/ for clarity (1/2 because git)

2016-08-25 10:18:09 +02:00

main.cpp

Renamed ImGuiSetCond_XXX type and enums to ImGuiCond_XXX, kept old enums under #ifdef IMGUI_DISABLE_OBSOLETE_FUNCTIONS

2017-08-11 13:36:28 +08:00

Makefile

add SDL GL3 makefile

2017-07-02 21:38:27 -05:00

opengl2_example.vcxproj

Examples: Renaming opengl_example/ to opengl2_example/ for clarity (1/2 because git)

2016-08-25 10:25:51 +02:00

opengl2_example.vcxproj.filters

Examples: Renaming opengl_example/ to opengl2_example/ for clarity (1/2 because git)

2016-08-25 10:25:51 +02:00