Merge remote-tracking branch 'origin' into 2016-07-navigation

This commit is contained in:
ocornut
2016-08-23 17:00:11 +02:00
2 changed files with 14 additions and 4 deletions

1
examples/.gitignore vendored
View File

@ -33,6 +33,7 @@ opengl3_example/opengl3_example
*.obj
*.exe
*.pdb
*.ilk
## Ini files
imgui.ini