diff options
| author | inmarket <andrewh@inmarket.com.au> | 2013-06-15 21:37:22 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2013-06-15 21:37:22 +1000 |
| commit | ed0bac9765614e9f12bc02661e37f41d6f30975e (patch) | |
| tree | 3c56f89326ecd9f0e0ada0f03fc3346cfc38776e /demos/modules/gwin/slider | |
| parent | 0dca00fc21e12104b76beb625c15a61134482898 (diff) | |
| download | uGFX-ed0bac9765614e9f12bc02661e37f41d6f30975e.tar.gz uGFX-ed0bac9765614e9f12bc02661e37f41d6f30975e.tar.bz2 uGFX-ed0bac9765614e9f12bc02661e37f41d6f30975e.zip | |
License header updates
Diffstat (limited to 'demos/modules/gwin/slider')
| -rw-r--r-- | demos/modules/gwin/slider/gfxconf.h | 33 | ||||
| -rw-r--r-- | demos/modules/gwin/slider/main.c | 2 |
2 files changed, 29 insertions, 6 deletions
diff --git a/demos/modules/gwin/slider/gfxconf.h b/demos/modules/gwin/slider/gfxconf.h index 84698905..b7b39a3f 100644 --- a/demos/modules/gwin/slider/gfxconf.h +++ b/demos/modules/gwin/slider/gfxconf.h @@ -1,9 +1,30 @@ -/** - * This file has a different license to the rest of the GFX system. - * You can copy, modify and distribute this file as you see fit. - * You do not need to publish your source modifications to this file. - * The only thing you are not permitted to do is to relicense it - * under a different license. +/* + * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org> + * Copyright (c) 2012, 2013, Andrew Hannam aka inmarket + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the <organization> nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifndef _GFXCONF_H diff --git a/demos/modules/gwin/slider/main.c b/demos/modules/gwin/slider/main.c index c56a1aa7..15dc3e26 100644 --- a/demos/modules/gwin/slider/main.c +++ b/demos/modules/gwin/slider/main.c @@ -1,5 +1,7 @@ /* * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org> + * Copyright (c) 2012, 2013, Andrew Hannam aka inmarket + * * All rights reserved. * * Redistribution and use in source and binary forms, with or without |