Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-07-04 20:18:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Docking: Fixed various conflicts not properly resolved on 813e0c1

Browse Source 
New git client confusion.
This commit is contained in:
omar
2019-11-27 19:27:44 +01:00
parent 4dff49b2f1
commit 28dd8d7efd
4 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/CHANGELOG.txt
View File

@ -30,7 +30,6 @@ HOW TO UPDATE?
-----------------------------------------------------------------------
<<<<<<< HEAD
DOCKING BRANCH (In Progress)
-----------------------------------------------------------------------
@ -100,10 +99,7 @@ Other changes:
-----------------------------------------------------------------------
VERSION 1.74 WIP (In Progress)
=======
VERSION 1.74 (Released 2019-11-25)
>>>>>>> master
-----------------------------------------------------------------------
Breaking Changes: