From: Thierry Parmentelat Date: Fri, 11 Jan 2013 07:05:17 +0000 (+0100) Subject: Merge branch 'geni-v2' of ssh://git.onelab.eu/git/sfa into geni-v2 X-Git-Tag: sfa-2.1-23~26^2 X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=8e965651869430c170112fc43fc09fe2de6ab060;hp=88a05cd0cbc248c488f478df7494f2a18aa18837 Merge branch 'geni-v2' of ssh://git.onelab.eu/git/sfa into geni-v2 --- diff --git a/LICENSE.txt b/LICENSE.txt index 08f6d5d3..8c722873 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,5 @@ -Copyright (c) 2008 Board of Trustees, Princeton University +Copyright (c) 2008-2013 Board of Trustees, Princeton University +Copyright (c) 2010-2013 INRIA, Institut National d'Informatique et Automatique Permission is hereby granted, free of charge, to any person obtaining a copy of this software and/or hardware specification (the “Work”) to