From: Thierry Parmentelat Date: Wed, 10 Sep 2014 15:40:15 +0000 (+0200) Subject: Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3 X-Git-Tag: sfa-3.1-11~4 X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=1ccd723dbd0ea31216600e69e240fce8b255f53e;hp=bcfbfc568a579b303a20030769283df212239924 Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3 # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit. --- diff --git a/LICENSE.txt b/LICENSE.txt index 8c722873..2d6787b9 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,5 +1,5 @@ Copyright (c) 2008-2013 Board of Trustees, Princeton University -Copyright (c) 2010-2013 INRIA, Institut National d'Informatique et Automatique +Copyright (c) 2010-2014 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