From e681937f66223a0466d5320556fe35745409fbf7 Mon Sep 17 00:00:00 2001 From: ocornut Date: Sat, 11 Jul 2015 08:41:11 -0600 Subject: [PATCH] Delete merging artefact that survived for a day --- imgui.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/imgui.cpp b/imgui.cpp index a4e02e594..0ced210a5 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -138,7 +138,6 @@ Occasionally introducing changes that are breaking the API. The breakage are generally minor and easy to fix. Here is a change-log of API breaking changes, if you are using one of the functions listed, expect to have to fix some code. -<<<<<<< HEAD - 2015/07/08 (1.43) - switched rendering data to use indexed rendering. this is saving a fair amount of CPU/GPU and enables us to get anti-aliasing for a marginal cost. this necessary change will break your rendering function! the fix should be very easy. sorry for that :( - if you are using a vanilla copy of one of the imgui_impl_XXXX.cpp provided in the example, you just need to update your copy and you can ignore the rest.