diff options
author | Rob Kendrick <rjek@netsurf-browser.org> | 2008-09-05 09:19:48 +0000 |
---|---|---|
committer | Rob Kendrick <rjek@netsurf-browser.org> | 2008-09-05 09:19:48 +0000 |
commit | 60f78cf536c2de0345fde23cd9e7d370590cd0ff (patch) | |
tree | 1f2eaf25297ef1a93db9518841c59648fafc0785 | |
parent | 45c46db8b48fb85e0b0368bc647a6949cb19014b (diff) | |
download | libnsbmp-60f78cf536c2de0345fde23cd9e7d370590cd0ff.tar.gz libnsbmp-60f78cf536c2de0345fde23cd9e7d370590cd0ff.tar.bz2 |
Change libnsbmp to MIT licence
svn path=/trunk/libnsbmp/; revision=5242
-rw-r--r-- | COPYING | 20 | ||||
-rw-r--r-- | examples/decode_bmp.c | 16 | ||||
-rw-r--r-- | examples/decode_ico.c | 16 | ||||
-rw-r--r-- | libnsbmp.c | 18 | ||||
-rw-r--r-- | utils/log.h | 19 |
5 files changed, 34 insertions, 55 deletions
@@ -0,0 +1,20 @@ +Copyright (C) 2006 Richard Wilson +Copyright (C) 2008 Sean Fox + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + + * The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/examples/decode_bmp.c b/examples/decode_bmp.c index dbf83e2..8675b34 100644 --- a/examples/decode_bmp.c +++ b/examples/decode_bmp.c @@ -2,19 +2,9 @@ * Copyright 2008 Sean Fox <dyntryx@gmail.com> * Copyright 2008 James Bursa <james@netsurf-browser.org> * - * This file is part of NetSurf, http://www.netsurf-browser.org/ - * - * NetSurf is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * NetSurf is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * This file is part of NetSurf's libnsbmp, http://www.netsurf-browser.org/ + * Licenced under the MIT License, + * http://www.opensource.org/licenses/mit-license.php */ #include <assert.h> diff --git a/examples/decode_ico.c b/examples/decode_ico.c index b02cd57..c940606 100644 --- a/examples/decode_ico.c +++ b/examples/decode_ico.c @@ -2,19 +2,9 @@ * Copyright 2008 Sean Fox <dyntryx@gmail.com> * Copyright 2008 James Bursa <james@netsurf-browser.org> * - * This file is part of NetSurf, http://www.netsurf-browser.org/ - * - * NetSurf is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * NetSurf is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * This file is part of NetSurf's libnsbmp, http://www.netsurf-browser.org/ + * Licenced under the MIT License, + * http://www.opensource.org/licenses/mit-license.php */ #include <assert.h> @@ -1,20 +1,10 @@ /* - * Copyright 2006 Richard Wilson <info@tinct.net> + * Copyright 2006 Richard Wilson <richard.wilson@netsurf-browser.org> * Copyright 2008 Sean Fox <dyntryx@gmail.com> * - * This file is part of NetSurf, http://www.netsurf-browser.org/ - * - * NetSurf is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * NetSurf is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * This file is part of NetSurf's libnsbmp, http://www.netsurf-browser.org/ + * Licenced under the MIT License, + * http://www.opensource.org/licenses/mit-license.php */ #include <assert.h> diff --git a/utils/log.h b/utils/log.h index 18b68d0..cfea5e9 100644 --- a/utils/log.h +++ b/utils/log.h @@ -1,27 +1,16 @@ /* * Copyright 2003 James Bursa <bursa@users.sourceforge.net> * Copyright 2004 John Tytgat <John.Tytgat@aaug.net> - * Copyright 2008 Sean Fox <dyntryx@gmail.com> * * This file is part of NetSurf, http://www.netsurf-browser.org/ - * - * NetSurf is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * NetSurf is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * Licenced under the MIT License, + * http://www.opensource.org/licenses/mit-license.php */ #include <stdio.h> -#ifndef _LIBNSBMP_LOG_H_ -#define _LIBNSBMP_LOG_H_ +#ifndef _LIBNSGIF_LOG_H_ +#define _LIBNSGIF_LOG_H_ #ifdef NDEBUG # define LOG(x) ((void) 0) |