- Olena-patches

Re: [Olena-patches] [Olena] #32: Improve the integration of Doxygen into the (autoconfiscated) package
by Olena Trac 10 Jul '09

10 Jul '09

#32: Improve the integration of Doxygen into the (autoconfiscated) package --------------------------+------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: enhancement | Status: new Priority: trivial | Milestone: Olena 1.1 Component: Olena | Version: 1.0 Resolution: | Keywords: --------------------------+------------------------------------------------- Changes (by levill_r): * milestone: Olena 1.0 => Olena 1.1 -- Ticket URL: <https://trac.lrde.org/olena/ticket/32#comment:4> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

Re: [Olena-patches] [Olena] #81: Olena 1.0 Reference Documentation
by Olena Trac 10 Jul '09

10 Jul '09

#81: Olena 1.0 Reference Documentation -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: closed Priority: minor | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Resolution: fixed | Keywords: doc -----------------------+---------------------------------------------------- Changes (by levill_r): * status: new => closed * resolution: => fixed -- Ticket URL: <https://trac.lrde.org/olena/ticket/81#comment:3> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

Re: [Olena-patches] [Olena] #80: Olena 1.0 User Documentation
by Olena Trac 10 Jul '09

10 Jul '09

#80: Olena 1.0 User Documentation -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: closed Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Resolution: fixed | Keywords: vaucanson doc -----------------------+---------------------------------------------------- Changes (by levill_r): * status: new => closed * resolution: => fixed -- Ticket URL: <https://trac.lrde.org/olena/ticket/80#comment:7> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

Re: [Olena-patches] [Olena] #82: Olena 1.0 Tutorial
by Olena Trac 10 Jul '09

10 Jul '09

#82: Olena 1.0 Tutorial -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: closed Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Resolution: fixed | Keywords: -----------------------+---------------------------------------------------- Changes (by levill_r): * status: new => closed * resolution: => fixed Comment: Closing; written by Guillaume Lazzara. -- Ticket URL: <https://trac.lrde.org/olena/ticket/82#comment:2> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

Re: [Olena-patches] [Olena] #83: Olena 1.0 Whitepaper
by Olena Trac 10 Jul '09

10 Jul '09

#83: Olena 1.0 Whitepaper -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: closed Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Resolution: fixed | Keywords: -----------------------+---------------------------------------------------- Changes (by levill_r): * status: new => closed * resolution: => fixed Comment: Closing; written by Guillaume Lazzara. -- Ticket URL: <https://trac.lrde.org/olena/ticket/83#comment:4> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

[Olena] #191: Support g++ 3.4
by Olena Trac 10 Jul '09

10 Jul '09

#191: Support g++ 3.4 -------------------------+-------------------------------------------------- Reporter: theo | Owner: theo Type: enhancement | Status: new Priority: critical | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Keywords: | -------------------------+-------------------------------------------------- g++ 3.4 is the default compiler on Cygwin. -- Ticket URL: <https://trac.lrde.org/olena/ticket/191> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 2

[Olena] #211: BSD Make compatibility
by Olena Trac 10 Jul '09

10 Jul '09

#211: BSD Make compatibility -------------------------+-------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: enhancement | Status: new Priority: minor | Milestone: Olena 1.1 Component: Olena | Version: 1.0 Keywords: | -------------------------+-------------------------------------------------- FreeBSD's `make` does not like some of our Makefiles (like source:trunk/milena/doc/Makefile.am), which prevents users to compile the project using just `make` (however `gmake` just runs fine). On Mac OS X, the command `bsdmake` is probably the same as FreeBSD's natural `make`. On Debian, the package `pmake` seems to be close to FreeBSD's `make`. -- Ticket URL: <https://trac.lrde.org/olena/ticket/211> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

4264: mln/geom/rotate.hh: Avoid an ICE with gcc 4.0.1 on MacOs X (leopard 10.5).
by Guillaume Lazzara 09 Jul '09

09 Jul '09

--- milena/mln/geom/rotate.hh | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/milena/mln/geom/rotate.hh b/milena/mln/geom/rotate.hh index 8c0e3ca..f53359b 100644 --- a/milena/mln/geom/rotate.hh +++ b/milena/mln/geom/rotate.hh @@ -165,7 +165,10 @@ namespace mln mln_concrete(I) rotate(const Image<I>& input, double angle, const Ext& extension) { - return rotate(input, angle, extension, mln_box(I)()); + /// Old versions of GCC do not parse correctly `mln_box(I)()'. + /// Hence, we need to typedef mln_box(I) first. + typedef mln_box(I) box_t; + return rotate(input, angle, extension, box_t()); } -- 1.5.6.5

1 0

4263: lrde-upload.sh: Call chmod before copying files.
by Guillaume Lazzara 09 Jul '09

09 Jul '09

--- ChangeLog | 6 +++++- lrde-upload.sh | 10 +++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 756268e..b0353a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,12 @@ +2009-07-09 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + * lrde-upload.sh: Call chmod before copying files. + 2009-07-08 Guillaume Lazzara <lazzara(a)lrde.epita.fr> Improve lrde-upload.sh script. - * lrde-upload.sh: + * lrde-upload.sh: - Prune old tarballs. - Append the current date to the tarball name. diff --git a/lrde-upload.sh b/lrde-upload.sh index b6730f3..039889b 100755 --- a/lrde-upload.sh +++ b/lrde-upload.sh @@ -7,8 +7,8 @@ set -e set -x -DEST=/lrde/dload/olena/snapshots/ -DEST_DOC=$DEST/doc/milena/ +DEST=/lrde/dload/olena/snapshots +DEST_DOC=$DEST/doc/milena # Retrieve the package version VERSION=`autoconf --trace='AC_INIT:$2'` @@ -41,6 +41,11 @@ mkdir -p $DEST_DOC rm -rf $DEST_DOC/user_doc.tmp rm -rf $DEST_DOC/white_paper_html.tmp + +# Dist check set umask to 077. Restoring permissions for all +chmod -R a+rx milena/doc/user +chmod -R a+rx milena/doc/white_paper + cp -pR milena/doc/user/html $DEST_DOC/user_doc.tmp cp -pR milena/doc/white_paper/white_paper_html $DEST_DOC/white_paper_html.tmp @@ -48,7 +53,6 @@ cp milena/doc/ref_guide/ref_guide.pdf $DEST_DOC/ cp milena/doc/tutorial/tutorial.pdf $DEST_DOC/ cp milena/doc/user/latex/refman.pdf $DEST_DOC/user_doc.pdf cp milena/doc/white_paper/white_paper.pdf $DEST_DOC/ -chmod -R a+rX $DEST_DOC/ mv -f $DEST_DOC/user_doc $DEST_DOC/user_doc.old || true mv -f $DEST_DOC/white_paper_html $DEST_DOC/white_paper_html.old || true -- 1.5.6.5

1 0

4262: Make sure the documentation license is GPL v2.
by Guillaume Lazzara 08 Jul '09

08 Jul '09

* doc/Doxyfile.in, * doc/doc.mk, * doc/doxyfuns.sty, * doc/generate_dist_files.sh, * doc/milena.sty, * doc/ref_guide/ref_guide.tex, * doc/tutorial/tutorial.tex, * doc/white_paper/white_paper.tex, * mln/core/concept/object.hh: Update license headers. --- milena/ChangeLog | 14 ++++++++ milena/doc/Doxyfile.in | 17 ++++++++++ milena/doc/doc.mk | 3 +- milena/doc/doxyfuns.sty | 31 ++++++------------ milena/doc/generate_dist_files.sh | 16 +++++++++ milena/doc/milena.sty | 28 +++++----------- milena/doc/ref_guide/ref_guide.tex | 54 ++++++++++++++++++++----------- milena/doc/tutorial/tutorial.tex | 53 ++++++++++++++++++++----------- milena/doc/white_paper/white_paper.tex | 34 ++++++++++++++++++++ milena/mln/core/concept/object.hh | 11 +----- 10 files changed, 173 insertions(+), 88 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f279706..5a7dda9 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,19 @@ 2009-07-08 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + Make sure the documentation license is GPL v2. + + * doc/Doxyfile.in, + * doc/doc.mk, + * doc/doxyfuns.sty, + * doc/generate_dist_files.sh, + * doc/milena.sty, + * doc/ref_guide/ref_guide.tex, + * doc/tutorial/tutorial.tex, + * doc/white_paper/white_paper.tex, + * mln/core/concept/object.hh: Update license headers. + +2009-07-08 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + Fix last issues with ICC. * mln/labeling/colorize.hh: make it deterministic whatever the diff --git a/milena/doc/Doxyfile.in b/milena/doc/Doxyfile.in index 6afa13f..7774897 100644 --- a/milena/doc/Doxyfile.in +++ b/milena/doc/Doxyfile.in @@ -1,3 +1,20 @@ +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE) +# +# This file is part of Olena. +# +# Olena is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, version 2 of the License. +# +# Olena is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Olena. If not, see <http://www.gnu.org/licenses/>. +# # Doxyfile 1.5.1 #--------------------------------------------------------------------------- diff --git a/milena/doc/doc.mk b/milena/doc/doc.mk index abc1c12..eb9290a 100644 --- a/milena/doc/doc.mk +++ b/milena/doc/doc.mk @@ -1,6 +1,7 @@ # -*- Automake -*- -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory +# (LRDE). # # This file is part of Olena. # diff --git a/milena/doc/doxyfuns.sty b/milena/doc/doxyfuns.sty index cf0d0b6..e99bff0 100644 --- a/milena/doc/doxyfuns.sty +++ b/milena/doc/doxyfuns.sty @@ -1,29 +1,18 @@ -%% Copyright (C) 2009 EPITA Research and Development Laboratory +%% Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) %% -%% This file is part of the Milena Library. This library is free -%% software; you can redistribute it and/or modify it under the terms -%% of the GNU General Public License version 2 as published by the -%% Free Software Foundation. +%% This file is part of Olena. %% -%% This library is distributed in the hope that it will be useful, +%% Olena is free software: you can redistribute it and/or modify it under +%% the terms of the GNU General Public License as published by the Free +%% Software Foundation, version 2 of the License. +%% +%% Olena is distributed in the hope that it will be useful, %% but WITHOUT ANY WARRANTY; without even the implied warranty of %% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %% General Public License for more details. %% %% You should have received a copy of the GNU General Public License -%% along with this library; see the file COPYING. If not, write to -%% the Free Software Foundation, 51 Franklin Street, Fifth Floor, -%% Boston, MA 02111-1307, USA. -%% -%% As a special exception, you may use this file as part of a free -%% software library without restriction. Specifically, if other files -%% instantiate templates or use macros or inline functions from this -%% file, or you compile this file and link it with other files to -%% produce an executable, this file does not by itself cause the -%% resulting executable to be covered by the GNU General Public -%% License. This exception does not however invalidate any other -%% reasons why the executable file might be covered by the GNU General -%% Public License. +%% along with Olena. If not, see <http://www.gnu.org/licenses/>. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -104,7 +93,7 @@ % Include an output image. % #1 - output image number. % #2 - related sample file name. -% #3 - Size of the picture (Latex ONLY) +% #3 - Size of the picture (Latex ONLY) \newcommand{\doxyfigure}[3][1]{ \backslash endhtmlonly% \backslash image html #2-#1.png% @@ -113,7 +102,7 @@ % Include an image from located in one of the path specified in IMAGE_PATH. % #1 - image name. -% #2 - Size of the picture (Latex ONLY) +% #2 - Size of the picture (Latex ONLY) \newcommand{\doxyimg}[2]{ \backslash endhtmlonly% \backslash image html #1.png% diff --git a/milena/doc/generate_dist_files.sh b/milena/doc/generate_dist_files.sh index 6a6b711..5ff7aca 100755 --- a/milena/doc/generate_dist_files.sh +++ b/milena/doc/generate_dist_files.sh @@ -1,3 +1,19 @@ +# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# +# This file is part of Olena. +# +# Olena is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, version 2 of the License. +# +# Olena is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Olena. If not, see <http://www.gnu.org/licenses/>. + #! /bin/sh ## FIXME: Don't use `echo -n', as echo's options are not portable. diff --git a/milena/doc/milena.sty b/milena/doc/milena.sty index 9a9a617..f4df262 100644 --- a/milena/doc/milena.sty +++ b/milena/doc/milena.sty @@ -1,29 +1,19 @@ -%% Copyright (C) 2009 EPITA Research and Development Laboratory +%% Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) %% -%% This file is part of the Milena Library. This library is free -%% software; you can redistribute it and/or modify it under the terms -%% of the GNU General Public License version 2 as published by the -%% Free Software Foundation. +%% This file is part of Olena. %% -%% This library is distributed in the hope that it will be useful, +%% Olena is free software: you can redistribute it and/or modify it under +%% the terms of the GNU General Public License as published by the Free +%% Software Foundation, version 2 of the License. +%% +%% Olena is distributed in the hope that it will be useful, %% but WITHOUT ANY WARRANTY; without even the implied warranty of %% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %% General Public License for more details. %% %% You should have received a copy of the GNU General Public License -%% along with this library; see the file COPYING. If not, write to -%% the Free Software Foundation, 51 Franklin Street, Fifth Floor, -%% Boston, MA 02111-1307, USA. -%% -%% As a special exception, you may use this file as part of a free -%% software library without restriction. Specifically, if other files -%% instantiate templates or use macros or inline functions from this -%% file, or you compile this file and link it with other files to -%% produce an executable, this file does not by itself cause the -%% resulting executable to be covered by the GNU General Public -%% License. This exception does not however invalidate any other -%% reasons why the executable file might be covered by the GNU General -%% Public License. +%% along with Olena. If not, see <http://www.gnu.org/licenses/>. + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/milena/doc/ref_guide/ref_guide.tex b/milena/doc/ref_guide/ref_guide.tex index dec1885..4acf619 100644 --- a/milena/doc/ref_guide/ref_guide.tex +++ b/milena/doc/ref_guide/ref_guide.tex @@ -1,29 +1,19 @@ -%% Copyright (C) 2009 EPITA Research and Development Laboratory +%% Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) %% -%% This file is part of the Milena Library. This library is free -%% software; you can redistribute it and/or modify it under the terms -%% of the GNU General Public License version 2 as published by the -%% Free Software Foundation. +%% This file is part of Olena. %% -%% This library is distributed in the hope that it will be useful, +%% Olena is free software: you can redistribute it and/or modify it under +%% the terms of the GNU General Public License as published by the Free +%% Software Foundation, version 2 of the License. +%% +%% Olena is distributed in the hope that it will be useful, %% but WITHOUT ANY WARRANTY; without even the implied warranty of %% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %% General Public License for more details. %% %% You should have received a copy of the GNU General Public License -%% along with this library; see the file COPYING. If not, write to -%% the Free Software Foundation, 51 Franklin Street, Fifth Floor, -%% Boston, MA 02111-1307, USA. -%% -%% As a special exception, you may use this file as part of a free -%% software library without restriction. Specifically, if other files -%% instantiate templates or use macros or inline functions from this -%% file, or you compile this file and link it with other files to -%% produce an executable, this file does not by itself cause the -%% resulting executable to be covered by the GNU General Public -%% License. This exception does not however invalidate any other -%% reasons why the executable file might be covered by the GNU General -%% Public License. +%% along with Olena. If not, see <http://www.gnu.org/licenses/>. + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -53,6 +43,7 @@ \begin{document} + % Doxygen use only - Generate the left menu. %Write foreword below. \begin{htmlonly} @@ -80,9 +71,34 @@ \backslash htmlonly \end{htmlonly} + + \begin{latexonly} \maketitle +%==================================== +\chapter*{Copyright} + +Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). + + +This document is part of Olena. + + +Olena is free software: you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation, version 2 of the License. + + +Olena is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + + +You should have received a copy of the GNU General Public License +along with Olena. If not, see $<$http://www.gnu.org/licenses/$>$. + \tableofcontents \end{latexonly} diff --git a/milena/doc/tutorial/tutorial.tex b/milena/doc/tutorial/tutorial.tex index 3d2e847..407c982 100644 --- a/milena/doc/tutorial/tutorial.tex +++ b/milena/doc/tutorial/tutorial.tex @@ -1,29 +1,19 @@ -%% Copyright (C) 2009 EPITA Research and Development Laboratory +%% Copyright (C) 2008, 2009 EPITA Research and Development Laboratory +%% (LRDE) %% -%% This file is part of the Milena Library. This library is free -%% software; you can redistribute it and/or modify it under the terms -%% of the GNU General Public License version 2 as published by the -%% Free Software Foundation. +%% This file is part of Olena. %% -%% This library is distributed in the hope that it will be useful, +%% Olena is free software: you can redistribute it and/or modify it under +%% the terms of the GNU General Public License as published by the Free +%% Software Foundation, version 2 of the License. +%% +%% Olena is distributed in the hope that it will be useful, %% but WITHOUT ANY WARRANTY; without even the implied warranty of %% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %% General Public License for more details. %% %% You should have received a copy of the GNU General Public License -%% along with this library; see the file COPYING. If not, write to -%% the Free Software Foundation, 51 Franklin Street, Fifth Floor, -%% Boston, MA 02111-1307, USA. -%% -%% As a special exception, you may use this file as part of a free -%% software library without restriction. Specifically, if other files -%% instantiate templates or use macros or inline functions from this -%% file, or you compile this file and link it with other files to -%% produce an executable, this file does not by itself cause the -%% resulting executable to be covered by the GNU General Public -%% License. This exception does not however invalidate any other -%% reasons why the executable file might be covered by the GNU General -%% Public License. +%% along with Olena. If not, see <http://www.gnu.org/licenses/>. %%%%%%%%%%%%%%%%%%%%%% @@ -80,10 +70,35 @@ \begin{latexonly} \maketitle +%==================================== +\chapter*{Copyright} + +Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). + + +This document is part of Olena. + + +Olena is free software: you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation, version 2 of the License. + + +Olena is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + + +You should have received a copy of the GNU General Public License +along with Olena. If not, see $<$http://www.gnu.org/licenses/$>$. + \tableofcontents + \end{latexonly} + %==================================== \doxychapter{tuto1}{Welcome} diff --git a/milena/doc/white_paper/white_paper.tex b/milena/doc/white_paper/white_paper.tex index fb230ae..f32a979 100644 --- a/milena/doc/white_paper/white_paper.tex +++ b/milena/doc/white_paper/white_paper.tex @@ -1,3 +1,19 @@ +%% Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +%% +%% This file is part of Olena. +%% +%% Olena is free software: you can redistribute it and/or modify it under +%% the terms of the GNU General Public License as published by the Free +%% Software Foundation, version 2 of the License. +%% +%% Olena is distributed in the hope that it will be useful, +%% but WITHOUT ANY WARRANTY; without even the implied warranty of +%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +%% General Public License for more details. +%% +%% You should have received a copy of the GNU General Public License +%% along with Olena. If not, see <http://www.gnu.org/licenses/>. + \documentclass{article} %\usepackage{hevea} @@ -180,4 +196,22 @@ Milena's \textbf{documentation}: %Demo + tuto + doc + +\section*{Copyright} +Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) + +This document is part of Olena. + +Olena is free software: you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation, version 2 of the License. + +Olena is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with Olena. If not, see $<$http://www.gnu.org/licenses/$>$. + \end{document} diff --git a/milena/mln/core/concept/object.hh b/milena/mln/core/concept/object.hh index 122306a..74e3c2a 100644 --- a/milena/mln/core/concept/object.hh +++ b/milena/mln/core/concept/object.hh @@ -109,6 +109,8 @@ \section copyright Copyright and License. Copyright (C) 2007, 2008, 2009 EPITA Research and Development (LRDE) + This documentation is part of Olena. + Olena is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2 of the License. @@ -120,15 +122,6 @@ You should have received a copy of the GNU General Public License along with Olena. If not, see <http://www.gnu.org/licenses/>. - - As a special exception, you may use this file as part of a free - software project without restriction. Specifically, if other files - instantiate templates or use macros or inline functions from this - file, or you compile this file and link it with other files to produce - an executable, this file does not by itself cause the resulting - executable to be covered by the GNU General Public License. This - exception does not however invalidate any other reasons why the - executable file might be covered by the GNU General Public License. */ -- 1.5.6.5

1 0