4 files changed
+5
-5
lines changed- backends/imgui_impl_allegro5.cpp+1-1
- backends/imgui_impl_allegro5.h+1-1
- backends/imgui_impl_android.cpp+1-1
- backends/imgui_impl_android.h+1-1
- backends/imgui_impl_dx10.h+1-1
- backends/imgui_impl_dx11.cpp+1-1
- backends/imgui_impl_dx11.h+1-1
- backends/imgui_impl_dx12.cpp+21-75
- backends/imgui_impl_dx12.h+12-33
- backends/imgui_impl_glfw.cpp+1-1
- backends/imgui_impl_glfw.h+1-1
- backends/imgui_impl_glut.cpp+1-1
- backends/imgui_impl_glut.h+1-1
- backends/imgui_impl_metal.mm+1-1
- backends/imgui_impl_opengl3.cpp+2-4
- backends/imgui_impl_osx.h+1-1
- backends/imgui_impl_osx.mm+2-2
- backends/imgui_impl_sdl2.cpp+1-1
- backends/imgui_impl_sdl2.h+1-1
- backends/imgui_impl_sdl3.cpp+1-1
- backends/imgui_impl_sdl3.h+1-1
- backends/imgui_impl_vulkan.cpp+3-3
- backends/imgui_impl_wgpu.h+1-1
- backends/imgui_impl_win32.cpp+59-65
- backends/imgui_impl_win32.h+1-1
- docs/CHANGELOG.txt+260-606
- examples/example_android_opengl3/main.cpp+1-1
- examples/example_win32_directx12/main.cpp+23-79
- imconfig.h+1
- imgui.cpp+213-88
- imgui.h+68-45
- imgui_demo.cpp+21-17
- imgui_draw.cpp+25-32
- imgui_internal.h+22-36
- imgui_tables.cpp+1-2
- imgui_widgets.cpp+63-66
- misc/freetype/imgui_freetype.cpp+2-3
Submodule NLOHMANN_JSON updated 47 files
- .clang-tidy+10
- .github/workflows/check_amalgamation.yml+3-3
- .github/workflows/cifuzz.yml+1-1
- .github/workflows/codeql-analysis.yml+2-2
- .github/workflows/macos.yml+61-9
- .github/workflows/publish_documentation.yml+2-2
- .github/workflows/ubuntu.yml+48-27
- .github/workflows/windows.yml+7-7
- BUILD.bazel-1
- CMakeLists.txt+6-1
- README.md+52-38
- cmake/ci.cmake+15-2
- docs/mkdocs/docs/api/macros/nlohmann_define_derived_type.md+118
- include/nlohmann/detail/conversions/from_json.hpp+22
- include/nlohmann/detail/conversions/to_chars.hpp+7-7
- include/nlohmann/detail/conversions/to_json.hpp+19
- include/nlohmann/detail/input/json_sax.hpp+2-2
- include/nlohmann/detail/input/lexer.hpp+1-1
- include/nlohmann/detail/input/parser.hpp+2-2
- include/nlohmann/detail/iterators/iteration_proxy.hpp+2-2
- include/nlohmann/detail/macro_scope.hpp+30
- include/nlohmann/detail/meta/cpp_future.hpp+1-1
- include/nlohmann/detail/meta/std_fs.hpp+1-1
- include/nlohmann/detail/meta/type_traits.hpp+3-3
- include/nlohmann/detail/output/binary_writer.hpp+1-1
- include/nlohmann/detail/output/serializer.hpp+3-3
- include/nlohmann/json.hpp+19-19
- single_include/nlohmann/json.hpp+113-42
- tests/src/unit-32bit.cpp+1-1
- tests/src/unit-alt-string.cpp+2-2
- tests/src/unit-bjdata.cpp+5-5
- tests/src/unit-bson.cpp+1-1
- tests/src/unit-cbor.cpp+5-6
- tests/src/unit-class_lexer.cpp+1-1
- tests/src/unit-conversions.cpp+92-2
- tests/src/unit-deserialization.cpp+13-13
- tests/src/unit-element_access1.cpp+14-14
- tests/src/unit-element_access2.cpp+10-10
- tests/src/unit-json_patch.cpp+1-1
- tests/src/unit-msgpack.cpp+3-3
- tests/src/unit-readme.cpp+1-1
- tests/src/unit-regression2.cpp+7-5
- tests/src/unit-serialization.cpp+1-1
- tests/src/unit-testsuites.cpp+2-2
- tests/src/unit-ubjson.cpp+2-2
- tests/src/unit-udt_macro.cpp+189-4
- tests/src/unit-unicode1.cpp+1-1
+2-2
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
| 23 | + | |
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| |||
187 | 187 | | |
188 | 188 | | |
189 | 189 | | |
190 | | - | |
| 190 | + | |
191 | 191 | | |
192 | 192 | | |
193 | 193 | | |
| |||
0 commit comments