Skip to content
This repository has been archived by the owner on Dec 31, 2022. It is now read-only.

Update to v1.85 #160

Merged
merged 2 commits into from
Nov 17, 2021
Merged

Update to v1.85 #160

merged 2 commits into from
Nov 17, 2021

Conversation

neclepsio
Copy link
Contributor

No description provided.

Copy link
Member

@dertseha dertseha left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you again.
Only a minor comment, I'll handle it.

@@ -43,7 +43,11 @@ This library does not mirror the versions of the wrapped **Dear ImGui**. The sem
* Minor changes: Extensions in API. Typically done through small version increments of **Dear ImGui** and/or exposing further features in a compatible way.
* Patch changes: Bug fixes - either in the wrapper or the wrapped **Dear ImGui**, given that the API & behaviour remains the same.

<<<<<<< HEAD
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to be a committed merge conflict. Please avoid those.

@dertseha dertseha merged commit 44567f2 into inkyblackness:main Nov 17, 2021
@neclepsio neclepsio deleted the noextra branch February 2, 2022 09:29
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants