diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2011-02-24 19:12:03 +0100 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2011-02-24 19:12:03 +0100 |
commit | 8fc14dfda2574598cbb2853b973d24c4c8dee1d1 (patch) | |
tree | 162b6fe9d8d69f0f6dd8de1585d74c359a798574 /src/adblock/adblockrule.cpp | |
parent | AdBlock: adding a Null Rule to match all the unimplemented filters. (diff) | |
download | rekonq-8fc14dfda2574598cbb2853b973d24c4c8dee1d1.tar.xz |
Finally found time to update copyrights... ;)
Diffstat (limited to 'src/adblock/adblockrule.cpp')
-rw-r--r-- | src/adblock/adblockrule.cpp | 34 |
1 files changed, 4 insertions, 30 deletions
diff --git a/src/adblock/adblockrule.cpp b/src/adblock/adblockrule.cpp index 7fdb3e10..3cd50020 100644 --- a/src/adblock/adblockrule.cpp +++ b/src/adblock/adblockrule.cpp @@ -1,36 +1,10 @@ -/* - * Copyright (c) 2009, Zsombor Gegesy <gzsombor@gmail.com> - * Copyright (c) 2009, Benjamin C. Meyer <ben@meyerhome.net> - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. 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. - * 3. Neither the name of the Benjamin Meyer 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 REGENTS 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 THE REGENTS OR CONTRIBUTORS 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. - * - * ============================================================ +/* ============================================================ * * This file is a part of the rekonq project * - * Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com> + * Copyright (c) 2009 by Zsombor Gegesy <gzsombor@gmail.com> + * Copyright (c) 2009 by Benjamin C. Meyer <ben@meyerhome.net> + * Copyright (C) 2010-2011 by Andrea Diamantini <adjam7 at gmail dot com> * * * This program is free software; you can redistribute it and/or |