From 1ec96233a6feedd9984c72362aa3ef6d13145382 Mon Sep 17 00:00:00 2001 From: AntiBlueQuirk Date: Thu, 5 Apr 2018 12:57:21 -0500 Subject: [PATCH] Fixing merge error --- nuklear.h | 2 +- src/nuklear.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nuklear.h b/nuklear.h index 7ce635c..10f1a0c 100644 --- a/nuklear.h +++ b/nuklear.h @@ -3437,7 +3437,7 @@ NK_API void nk_contextual_end(struct nk_context*); NK_API void nk_tooltip(struct nk_context*, const char*); #ifdef NK_INCLUDE_STANDARD_VARARGS NK_API void nk_tooltipf(struct nk_context*, NK_PRINTF_FORMAT_STRING const char*, ...) NK_PRINTF_VARARG_FUNC(2); -+NK_API void nk_tooltipfv(struct nk_context*, NK_PRINTF_FORMAT_STRING const char*, va_list) NK_PRINTF_VALIST_FUNC(2); +NK_API void nk_tooltipfv(struct nk_context*, NK_PRINTF_FORMAT_STRING const char*, va_list) NK_PRINTF_VALIST_FUNC(2); #endif NK_API int nk_tooltip_begin(struct nk_context*, float width); NK_API void nk_tooltip_end(struct nk_context*); diff --git a/src/nuklear.h b/src/nuklear.h index 8127f69..071cdd1 100644 --- a/src/nuklear.h +++ b/src/nuklear.h @@ -3221,7 +3221,7 @@ NK_API void nk_contextual_end(struct nk_context*); NK_API void nk_tooltip(struct nk_context*, const char*); #ifdef NK_INCLUDE_STANDARD_VARARGS NK_API void nk_tooltipf(struct nk_context*, NK_PRINTF_FORMAT_STRING const char*, ...) NK_PRINTF_VARARG_FUNC(2); -+NK_API void nk_tooltipfv(struct nk_context*, NK_PRINTF_FORMAT_STRING const char*, va_list) NK_PRINTF_VALIST_FUNC(2); +NK_API void nk_tooltipfv(struct nk_context*, NK_PRINTF_FORMAT_STRING const char*, va_list) NK_PRINTF_VALIST_FUNC(2); #endif NK_API int nk_tooltip_begin(struct nk_context*, float width); NK_API void nk_tooltip_end(struct nk_context*);