From 8f892ea84faadac5e080c3b33c9fcc83ae9b5f7a Mon Sep 17 00:00:00 2001 From: vurtun Date: Mon, 21 Sep 2015 20:38:37 +0200 Subject: [PATCH] added license text at the top of file --- demo/nanovg.c | 22 ++++++++++++++++++---- zahnrad.h | 3 +-- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/demo/nanovg.c b/demo/nanovg.c index 5bdea0c..9f0d161 100644 --- a/demo/nanovg.c +++ b/demo/nanovg.c @@ -1,8 +1,22 @@ /* - Copyright (c) 2015 - vurtun - MIT licence - */ + Copyright (c) 2015 Micha Mettke + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ #include #include #include diff --git a/zahnrad.h b/zahnrad.h index 5c64a6a..0525480 100644 --- a/zahnrad.h +++ b/zahnrad.h @@ -1058,7 +1058,6 @@ enum zr_anti_aliasing { /* renderes all primitives without anit-aliasing */ ZR_ANTI_ALIASING_ON, /* renderes all primitives with anit-aliasing */ - ZR_ANTI_ALIASING_MAX }; struct zr_draw_vertex { @@ -2247,7 +2246,7 @@ zr_float zr_widget_scrollbarh(struct zr_command_buffer*, struct zr_rect, */ /* STYLE ---------------------------- - The window style consists of properties, color and rectangle roundingo + The window style consists of properties, color and rectangle rounding information that is used for the general style and looks of window. In addition for temporary modification the configuration structure consists of a stack for pushing and pop either color or property values.