Skip to content

Commit

Permalink
Updated copyright to include 2013
Browse files Browse the repository at this point in the history
  • Loading branch information
emilaxelsson committed Nov 28, 2013
1 parent d407ab1 commit 621232c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
6 changes: 4 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Copyright (c) 2013, Emil Axelsson, Peter Jonsson, Anders Persson and
Josef Svenningsson
Copyright (c) 2012, Emil Axelsson, Gergely Dévai, Anders Persson and
Josef Svenningsson
Copyright (c) 2009-2011, ERICSSON AB
Expand All @@ -6,7 +8,7 @@ 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,
* 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
Expand All @@ -17,7 +19,7 @@ modification, are permitted provided that the following conditions are met:

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
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
Expand Down
4 changes: 3 additions & 1 deletion feldspar-language.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ description: Feldspar (Functional Embedded Language for DSP and PARallelism)
algorithms. This package contains the language front-end and an
interpreter.
category: Language
copyright: Copyright (c) 2012 Emil Axelsson, Gergely Dévai,
copyright: Copyright (c) 2013 Emil Axelsson, Peter Jonsson,
Anders Persson, Josef Svenningsson
Copyright (c) 2012 Emil Axelsson, Gergely Dévai,
Anders Persson, Josef Svenningsson
Copyright (c) 2009-2011, ERICSSON AB
author: Functional programming group at Chalmers University of Technology
Expand Down

0 comments on commit 621232c

Please sign in to comment.