mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-08-29 18:41:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking

Browse Source 
# Conflicts:
#	backends/imgui_impl_win32.cpp
#	docs/CHANGELOG.txt
This commit is contained in:
ocornut
2023-02-15 18:18:47 +01:00
parent 192196711a 5d74891285
commit e25e4526cd
10 changed files with 51 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
misc/freetype/imgui_freetype.cpp
View File

@@ -52,7 +52,7 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpragmas" // warning: unknown option after '#pragma GCC diagnostic' kind
#pragma GCC diagnostic ignored "-Wunused-function" // warning: 'xxxx' defined but not used
#pragma GCC diagnostic ignored "-Wsubobject-linkage" // warning: 'xxxx' has a field <EFBFBD>xxxx<EFBFBD> whose type uses the anonymous namespace
#pragma GCC diagnostic ignored "-Wsubobject-linkage" // warning: 'xxxx' has a field 'xxxx' whose type uses the anonymous namespace
#endif
//-------------------------------------------------------------------------