diff options
author | Evan Huus <eapache@gmail.com> | 2014-03-10 08:25:31 -0400 |
---|---|---|
committer | Evan Huus <eapache@gmail.com> | 2014-03-10 16:42:20 +0000 |
commit | 5de268aacbc85553bb6b2a78492cfd6f52785b55 (patch) | |
tree | 2568088de97ce823063b69449fc981f5d677a85d /epan/wslua/lrexlib_glib_f.c | |
parent | 0e3956ddde6d182e025eecc9ccaf74343a27a277 (diff) |
Replace "see copyright notice in" message with full license
Should make the licensecheck buildbot happy.
Also add "Public domain MIT/X11 (BSD like)" to the list of permitted licenses,
since it is a combination of two permitted licenses.
Change-Id: Ibc4ead09af89e9225c4e0589a2b7d06dcee6a44e
Reviewed-on: https://code.wireshark.org/review/581
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/wslua/lrexlib_glib_f.c')
-rw-r--r-- | epan/wslua/lrexlib_glib_f.c | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/epan/wslua/lrexlib_glib_f.c b/epan/wslua/lrexlib_glib_f.c index ed3299081f..c40af34c89 100644 --- a/epan/wslua/lrexlib_glib_f.c +++ b/epan/wslua/lrexlib_glib_f.c @@ -1,5 +1,29 @@ -/* lrexlib_gregex_f.c - GLib regular expression library */ -/* See Copyright Notice in the file lrexlib.h */ +/* lrexlib_glib_f.c - GLib regular expression library */ + +/* +This file, written by Hadriel Kaplan, is in the Public Domain, or +under the MIT license if your country does not allow Public Domain. + +Copyright (c) 2014 Hadriel Kaplan + +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. +*/ #include <glib.h> #include "lua.h" |