1
0
Fork 0
mirror of https://github.com/gwm17/implot.git synced 2024-11-26 12:18:52 -05:00

Merge branch 'master' into master

This commit is contained in:
ozlb 2020-05-13 17:25:26 +02:00 committed by GitHub
commit c71f893aeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 34 deletions

32
.gitignore vendored
View File

@ -1,32 +0,0 @@
# Prerequisites
*.d
# Compiled Object files
*.slo
*.lo
*.o
*.obj
# Precompiled Headers
*.gch
*.pch
# Compiled Dynamic libraries
*.so
*.dylib
*.dll
# Fortran module files
*.mod
*.smod
# Compiled Static libraries
*.lai
*.la
*.a
*.lib
# Executables
*.exe
*.out
*.app

View File

@ -2661,4 +2661,4 @@ void Digital(const char* label_id, ImVec2 (*getter_func)(void* data, int idx), v
return PlotDigitalEx(label_id, getter, count, offset);
}
} // namespace ImPlot
} // namespace ImPlot

View File

@ -792,4 +792,4 @@ void ShowDemoWindow(bool* p_open) {
ImGui::End();
}
} // namespace ImPlot
} // namespace ImPlot