Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-07-05 12:38:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into navigation

Browse Source 
# Conflicts:
#	imgui_internal.h
This commit is contained in:
omar
2017-08-21 00:04:45 +08:00
parent bf0d9c123e 530baee1a7
commit 53e73182ff
7 changed files with 296 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/.gitignore vendored
View File

@ -42,6 +42,8 @@ sdl_opengl3_example/x64/*
*.exe
*.pdb
*.ilk
*.VC.db
*.VC.VC.opendb
## Ini files
imgui.ini