[Olena-patches] olena: olena-2.0-953-gc961d5f Olena 2.1.

* NEWS, * README, * configure.ac, * milena/NEWS, * milena/doc/Doxyfile.in, * milena/doc/milena.qhcp, * scribo/NEWS, * scribo/doc/Doxyfile.in, * scribo/doc/scribo.qhcp, * swilena/NEWS: Update version number. * milena/doc/figures/extend-1.ppm, * milena/doc/figures/extend-2.ppm, * milena/doc/figures/extend-3.ppm, * milena/doc/figures/extend-4.ppm, * milena/doc/figures/extend-5.ppm, * milena/doc/figures/fill-1.ppm, * milena/doc/figures/fill-2.ppm, * milena/doc/figures/fill-imageif-cfun-1.ppm, * milena/doc/figures/fill-subdomain-1.pbm, * milena/doc/figures/fill-subdomain-2.ppm, * milena/doc/figures/fill-subdomain-3.ppm, * milena/doc/figures/fill-subdomain-4.ppm, * milena/doc/figures/ima2d-rot-1.ppm, * milena/doc/figures/ima2d-rot-2.ppm, * milena/doc/figures/ima_save.pbm, * milena/doc/figures/labeling-compute-1.pbm, * milena/doc/figures/labeling-compute-2.ppm, * milena/doc/figures/logical-not-1.pbm, * milena/doc/figures/logical-not-2.pbm, * milena/doc/figures/logical-not-3.pbm, * milena/doc/figures/tuto2_first_image-1.pbm, * milena/doc/figures/tuto3_colorize-1.pgm, * milena/doc/figures/tuto3_colorize-2.ppm, * milena/doc/figures/tuto3_rw_image-1.ppm, * milena/doc/figures/tuto3_rw_image-2.ppm, * milena/doc/figures/tuto3_rw_image-3.ppm, * milena/doc/figures/tuto4_genericity_and_algorithms-1.ppm, * milena/doc/figures/tuto4_genericity_and_algorithms-2.ppm, * milena/doc/figures/tuto4_genericity_and_algorithms-3.pbm, * milena/doc/figures/tuto4_genericity_and_algorithms-4.ppm, * milena/doc/figures/tuto4_genericity_and_algorithms-5.ppm, * milena/doc/figures/tuto4_genericity_and_algorithms-6.ppm, * milena/mln/version.hh: Regen. --- ChangeLog | 9 ++++ NEWS | 2 +- README | 6 +-- configure.ac | 2 +- milena/ChangeLog | 43 ++++++++++++++++++++ milena/NEWS | 2 +- milena/doc/Doxyfile.in | 2 +- milena/doc/figures/extend-1.ppm | Bin 12407 -> 12406 bytes milena/doc/figures/extend-2.ppm | Bin 16547 -> 16546 bytes milena/doc/figures/extend-3.ppm | Bin 16547 -> 16546 bytes milena/doc/figures/extend-4.ppm | 2 +- milena/doc/figures/extend-5.ppm | Bin 12407 -> 12406 bytes milena/doc/figures/fill-1.ppm | Bin 12407 -> 12406 bytes milena/doc/figures/fill-2.ppm | Bin 12407 -> 12406 bytes milena/doc/figures/fill-imageif-cfun-1.ppm | Bin 207 -> 206 bytes milena/doc/figures/fill-subdomain-1.pbm | 2 +- milena/doc/figures/fill-subdomain-2.ppm | Bin 207 -> 206 bytes milena/doc/figures/fill-subdomain-3.ppm | Bin 207 -> 206 bytes milena/doc/figures/fill-subdomain-4.ppm | Bin 207 -> 206 bytes milena/doc/figures/ima2d-rot-1.ppm | Bin 235321 -> 235320 bytes milena/doc/figures/ima2d-rot-2.ppm | Bin 235321 -> 235320 bytes milena/doc/figures/ima_save.pbm | 2 +- milena/doc/figures/labeling-compute-1.pbm | 2 +- milena/doc/figures/labeling-compute-2.ppm | Bin 207 -> 206 bytes milena/doc/figures/logical-not-1.pbm | 2 +- milena/doc/figures/logical-not-2.pbm | 2 +- milena/doc/figures/logical-not-3.pbm | 2 +- milena/doc/figures/tuto2_first_image-1.pbm | 2 +- milena/doc/figures/tuto3_colorize-1.pgm | Bin 142 -> 141 bytes milena/doc/figures/tuto3_colorize-2.ppm | Bin 192 -> 191 bytes milena/doc/figures/tuto3_rw_image-1.ppm | Bin 4919 -> 4918 bytes milena/doc/figures/tuto3_rw_image-2.ppm | 2 +- milena/doc/figures/tuto3_rw_image-3.ppm | Bin 12407 -> 12406 bytes .../figures/tuto4_genericity_and_algorithms-1.ppm | Bin 12407 -> 12406 bytes .../figures/tuto4_genericity_and_algorithms-2.ppm | Bin 12407 -> 12406 bytes .../figures/tuto4_genericity_and_algorithms-3.pbm | 2 +- .../figures/tuto4_genericity_and_algorithms-4.ppm | Bin 12407 -> 12406 bytes .../figures/tuto4_genericity_and_algorithms-5.ppm | Bin 12407 -> 12406 bytes .../figures/tuto4_genericity_and_algorithms-6.ppm | Bin 12407 -> 12406 bytes milena/doc/milena.qhcp | 4 +- milena/mln/version.hh | 4 +- scribo/ChangeLog | 9 ++++ scribo/NEWS | 2 +- scribo/doc/Doxyfile.in | 2 +- scribo/doc/scribo.qhcp | 4 +- swilena/ChangeLog | 6 +++ swilena/NEWS | 2 +- 47 files changed, 93 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f39c90..e211a0e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2014-07-08 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Olena 2.1. + + * NEWS, + * README, + * configure.ac: + Update version number. + +2014-07-08 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Update copyright notices in Olena. * doc/Doxyfile.in, diff --git a/NEWS b/NEWS index b0f8724..404b82a 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -* Olena 2.0a +* Olena 2.1 July 8, 2014 * Compilation issues with recent versions of GCC (up to version 4.8) and Clang (up to version 3.5) have been diff --git a/README b/README index b5abc9e..dc8e60e 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ Copyright (C) 2008, 2009, 2010, 2011, 2012, 2014 EPITA Research and -Development Laboratory (LRDE) +Development Laboratory (LRDE). This file is part of Olena. @@ -148,9 +148,9 @@ In order to prepare the build process, you need to configure the source tree. Assuming your Olena distribution is uncompressed in directory -`olena-2.0', follow these steps: +`olena-2.1', follow these steps: - % cd olena-2.0 + % cd olena-2.1 % mkdir _build % cd _build % ../configure diff --git a/configure.ac b/configure.ac index bd9e2c6..89a6b39 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,7 @@ AC_PREREQ([2.61]) ## Package set up. ## ## ---------------- ## -AC_INIT([Olena], [2.0a], [olena(a)lrde.epita.fr], [olena], +AC_INIT([Olena], [2.1], [olena(a)lrde.epita.fr], [olena], [http://olena.lrde.epita.fr]) # M4 macros. diff --git a/milena/ChangeLog b/milena/ChangeLog index 6f8428f..a7fe959 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,48 @@ 2014-07-08 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Milena 2.1. + + * milena/NEWS, + * milena/doc/Doxyfile.in, + * milena/doc/milena.qhcp: + Update version number. + * milena/doc/figures/extend-1.ppm, + * milena/doc/figures/extend-2.ppm, + * milena/doc/figures/extend-3.ppm, + * milena/doc/figures/extend-4.ppm, + * milena/doc/figures/extend-5.ppm, + * milena/doc/figures/fill-1.ppm, + * milena/doc/figures/fill-2.ppm, + * milena/doc/figures/fill-imageif-cfun-1.ppm, + * milena/doc/figures/fill-subdomain-1.pbm, + * milena/doc/figures/fill-subdomain-2.ppm, + * milena/doc/figures/fill-subdomain-3.ppm, + * milena/doc/figures/fill-subdomain-4.ppm, + * milena/doc/figures/ima2d-rot-1.ppm, + * milena/doc/figures/ima2d-rot-2.ppm, + * milena/doc/figures/ima_save.pbm, + * milena/doc/figures/labeling-compute-1.pbm, + * milena/doc/figures/labeling-compute-2.ppm, + * milena/doc/figures/logical-not-1.pbm, + * milena/doc/figures/logical-not-2.pbm, + * milena/doc/figures/logical-not-3.pbm, + * milena/doc/figures/tuto2_first_image-1.pbm, + * milena/doc/figures/tuto3_colorize-1.pgm, + * milena/doc/figures/tuto3_colorize-2.ppm, + * milena/doc/figures/tuto3_rw_image-1.ppm, + * milena/doc/figures/tuto3_rw_image-2.ppm, + * milena/doc/figures/tuto3_rw_image-3.ppm, + * milena/doc/figures/tuto4_genericity_and_algorithms-1.ppm, + * milena/doc/figures/tuto4_genericity_and_algorithms-2.ppm, + * milena/doc/figures/tuto4_genericity_and_algorithms-3.pbm, + * milena/doc/figures/tuto4_genericity_and_algorithms-4.ppm, + * milena/doc/figures/tuto4_genericity_and_algorithms-5.ppm, + * milena/doc/figures/tuto4_genericity_and_algorithms-6.ppm, + * milena/mln/version.hh: + Regen. + +2014-07-08 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Update copyright notices in Milena. * doc/Doxyfile.in, diff --git a/milena/NEWS b/milena/NEWS index b0d4fd8..8699406 100644 --- a/milena/NEWS +++ b/milena/NEWS @@ -1,4 +1,4 @@ -* Milena 2.0a +* Milena 2.1 July 8, 2014 * New algorithms: - mln::topo::skeleton::priority_driven_thinning. diff --git a/milena/doc/Doxyfile.in b/milena/doc/Doxyfile.in index 81699de..6d61b43 100644 --- a/milena/doc/Doxyfile.in +++ b/milena/doc/Doxyfile.in @@ -1148,7 +1148,7 @@ QHP_NAMESPACE = "fr.epita.lrde.olena.milena" # Qt Help Project output. For more information please see # http://doc.trolltech.com/qthelpproject.html#virtual-folders -QHP_VIRTUAL_FOLDER = "milena-2.0" +QHP_VIRTUAL_FOLDER = "milena-2.1" # If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to # add. For more information please see diff --git a/milena/doc/figures/extend-1.ppm b/milena/doc/figures/extend-1.ppm index cd9fa8c..28af3c5 100644 Binary files a/milena/doc/figures/extend-1.ppm and b/milena/doc/figures/extend-1.ppm differ diff --git a/milena/doc/figures/extend-2.ppm b/milena/doc/figures/extend-2.ppm index 6588674..70b21f3 100644 Binary files a/milena/doc/figures/extend-2.ppm and b/milena/doc/figures/extend-2.ppm differ diff --git a/milena/doc/figures/extend-3.ppm b/milena/doc/figures/extend-3.ppm index e79e3c9..bc352ad 100644 Binary files a/milena/doc/figures/extend-3.ppm and b/milena/doc/figures/extend-3.ppm differ diff --git a/milena/doc/figures/extend-4.ppm b/milena/doc/figures/extend-4.ppm index f4b94b3..64a8ce6 100644 --- a/milena/doc/figures/extend-4.ppm +++ b/milena/doc/figures/extend-4.ppm @@ -1,5 +1,5 @@ P6 -# Generated by Olena 2.0a (http://olena.lrde.epita.fr) +# Generated by Olena 2.1 (http://olena.lrde.epita.fr) # EPITA Research and Development Laboratory (LRDE) 64 64 255 diff --git a/milena/doc/figures/extend-5.ppm b/milena/doc/figures/extend-5.ppm index c4f03af..deee76d 100644 Binary files a/milena/doc/figures/extend-5.ppm and b/milena/doc/figures/extend-5.ppm differ diff --git a/milena/doc/figures/fill-1.ppm b/milena/doc/figures/fill-1.ppm index 48cbc46..a1187f0 100644 Binary files a/milena/doc/figures/fill-1.ppm and b/milena/doc/figures/fill-1.ppm differ diff --git a/milena/doc/figures/fill-2.ppm b/milena/doc/figures/fill-2.ppm index 617e6d0..64a626e 100644 Binary files a/milena/doc/figures/fill-2.ppm and b/milena/doc/figures/fill-2.ppm differ diff --git a/milena/doc/figures/fill-imageif-cfun-1.ppm b/milena/doc/figures/fill-imageif-cfun-1.ppm index 05a97d5..6a7b07d 100644 Binary files a/milena/doc/figures/fill-imageif-cfun-1.ppm and b/milena/doc/figures/fill-imageif-cfun-1.ppm differ diff --git a/milena/doc/figures/fill-subdomain-1.pbm b/milena/doc/figures/fill-subdomain-1.pbm index b68be4a..5d65d74 100644 --- a/milena/doc/figures/fill-subdomain-1.pbm +++ b/milena/doc/figures/fill-subdomain-1.pbm @@ -1,5 +1,5 @@ P4 -# Generated by Olena 2.0a (http://olena.lrde.epita.fr) +# Generated by Olena 2.1 (http://olena.lrde.epita.fr) # EPITA Research and Development Laboratory (LRDE) 5 6 ���(@x \ No newline at end of file diff --git a/milena/doc/figures/fill-subdomain-2.ppm b/milena/doc/figures/fill-subdomain-2.ppm index 4368d6a..5acbfef 100644 Binary files a/milena/doc/figures/fill-subdomain-2.ppm and b/milena/doc/figures/fill-subdomain-2.ppm differ diff --git a/milena/doc/figures/fill-subdomain-3.ppm b/milena/doc/figures/fill-subdomain-3.ppm index a29ab29..21648f4 100644 Binary files a/milena/doc/figures/fill-subdomain-3.ppm and b/milena/doc/figures/fill-subdomain-3.ppm differ diff --git a/milena/doc/figures/fill-subdomain-4.ppm b/milena/doc/figures/fill-subdomain-4.ppm index e341a8c..c97a77a 100644 Binary files a/milena/doc/figures/fill-subdomain-4.ppm and b/milena/doc/figures/fill-subdomain-4.ppm differ diff --git a/milena/doc/figures/ima2d-rot-1.ppm b/milena/doc/figures/ima2d-rot-1.ppm index 09dd453..a1417a1 100644 Binary files a/milena/doc/figures/ima2d-rot-1.ppm and b/milena/doc/figures/ima2d-rot-1.ppm differ diff --git a/milena/doc/figures/ima2d-rot-2.ppm b/milena/doc/figures/ima2d-rot-2.ppm index 45b2ebc..f75cbd1 100644 Binary files a/milena/doc/figures/ima2d-rot-2.ppm and b/milena/doc/figures/ima2d-rot-2.ppm differ diff --git a/milena/doc/figures/ima_save.pbm b/milena/doc/figures/ima_save.pbm index e432b75..0d51c7b 100644 --- a/milena/doc/figures/ima_save.pbm +++ b/milena/doc/figures/ima_save.pbm @@ -1,5 +1,5 @@ P4 -# Generated by Olena 2.0a (http://olena.lrde.epita.fr) +# Generated by Olena 2.1 (http://olena.lrde.epita.fr) # EPITA Research and Development Laboratory (LRDE) 5 5 X�X�� \ No newline at end of file diff --git a/milena/doc/figures/labeling-compute-1.pbm b/milena/doc/figures/labeling-compute-1.pbm index b68be4a..5d65d74 100644 --- a/milena/doc/figures/labeling-compute-1.pbm +++ b/milena/doc/figures/labeling-compute-1.pbm @@ -1,5 +1,5 @@ P4 -# Generated by Olena 2.0a (http://olena.lrde.epita.fr) +# Generated by Olena 2.1 (http://olena.lrde.epita.fr) # EPITA Research and Development Laboratory (LRDE) 5 6 ���(@x \ No newline at end of file diff --git a/milena/doc/figures/labeling-compute-2.ppm b/milena/doc/figures/labeling-compute-2.ppm index 4368d6a..5acbfef 100644 Binary files a/milena/doc/figures/labeling-compute-2.ppm and b/milena/doc/figures/labeling-compute-2.ppm differ diff --git a/milena/doc/figures/logical-not-1.pbm b/milena/doc/figures/logical-not-1.pbm index e432b75..0d51c7b 100644 --- a/milena/doc/figures/logical-not-1.pbm +++ b/milena/doc/figures/logical-not-1.pbm @@ -1,5 +1,5 @@ P4 -# Generated by Olena 2.0a (http://olena.lrde.epita.fr) +# Generated by Olena 2.1 (http://olena.lrde.epita.fr) # EPITA Research and Development Laboratory (LRDE) 5 5 X�X�� \ No newline at end of file diff --git a/milena/doc/figures/logical-not-2.pbm b/milena/doc/figures/logical-not-2.pbm index 025935b..438f8b5 100644 --- a/milena/doc/figures/logical-not-2.pbm +++ b/milena/doc/figures/logical-not-2.pbm @@ -1,5 +1,5 @@ P4 -# Generated by Olena 2.0a (http://olena.lrde.epita.fr) +# Generated by Olena 2.1 (http://olena.lrde.epita.fr) # EPITA Research and Development Laboratory (LRDE) 5 5 �P�PP \ No newline at end of file diff --git a/milena/doc/figures/logical-not-3.pbm b/milena/doc/figures/logical-not-3.pbm index 025935b..438f8b5 100644 --- a/milena/doc/figures/logical-not-3.pbm +++ b/milena/doc/figures/logical-not-3.pbm @@ -1,5 +1,5 @@ P4 -# Generated by Olena 2.0a (http://olena.lrde.epita.fr) +# Generated by Olena 2.1 (http://olena.lrde.epita.fr) # EPITA Research and Development Laboratory (LRDE) 5 5 �P�PP \ No newline at end of file diff --git a/milena/doc/figures/tuto2_first_image-1.pbm b/milena/doc/figures/tuto2_first_image-1.pbm index 4ba9667..06f8186 100644 --- a/milena/doc/figures/tuto2_first_image-1.pbm +++ b/milena/doc/figures/tuto2_first_image-1.pbm @@ -1,5 +1,5 @@ P4 -# Generated by Olena 2.0a (http://olena.lrde.epita.fr) +# Generated by Olena 2.1 (http://olena.lrde.epita.fr) # EPITA Research and Development Laboratory (LRDE) 21 13 �����ث�������������������������������� \ No newline at end of file diff --git a/milena/doc/figures/tuto3_colorize-1.pgm b/milena/doc/figures/tuto3_colorize-1.pgm index b62c7ec..259da64 100644 Binary files a/milena/doc/figures/tuto3_colorize-1.pgm and b/milena/doc/figures/tuto3_colorize-1.pgm differ diff --git a/milena/doc/figures/tuto3_colorize-2.ppm b/milena/doc/figures/tuto3_colorize-2.ppm index 1d44e4c..b312ca0 100644 Binary files a/milena/doc/figures/tuto3_colorize-2.ppm and b/milena/doc/figures/tuto3_colorize-2.ppm differ diff --git a/milena/doc/figures/tuto3_rw_image-1.ppm b/milena/doc/figures/tuto3_rw_image-1.ppm index 674ac7f..aa69ec8 100644 Binary files a/milena/doc/figures/tuto3_rw_image-1.ppm and b/milena/doc/figures/tuto3_rw_image-1.ppm differ diff --git a/milena/doc/figures/tuto3_rw_image-2.ppm b/milena/doc/figures/tuto3_rw_image-2.ppm index 0a94b08..87accce 100644 --- a/milena/doc/figures/tuto3_rw_image-2.ppm +++ b/milena/doc/figures/tuto3_rw_image-2.ppm @@ -1,5 +1,5 @@ P6 -# Generated by Olena 2.0a (http://olena.lrde.epita.fr) +# Generated by Olena 2.1 (http://olena.lrde.epita.fr) # EPITA Research and Development Laboratory (LRDE) 40 40 255 diff --git a/milena/doc/figures/tuto3_rw_image-3.ppm b/milena/doc/figures/tuto3_rw_image-3.ppm index d334995..0fd165f 100644 Binary files a/milena/doc/figures/tuto3_rw_image-3.ppm and b/milena/doc/figures/tuto3_rw_image-3.ppm differ diff --git a/milena/doc/figures/tuto4_genericity_and_algorithms-1.ppm b/milena/doc/figures/tuto4_genericity_and_algorithms-1.ppm index 9a9aca7..92684a7 100644 Binary files a/milena/doc/figures/tuto4_genericity_and_algorithms-1.ppm and b/milena/doc/figures/tuto4_genericity_and_algorithms-1.ppm differ diff --git a/milena/doc/figures/tuto4_genericity_and_algorithms-2.ppm b/milena/doc/figures/tuto4_genericity_and_algorithms-2.ppm index af5cf30..2bde9d8 100644 Binary files a/milena/doc/figures/tuto4_genericity_and_algorithms-2.ppm and b/milena/doc/figures/tuto4_genericity_and_algorithms-2.ppm differ diff --git a/milena/doc/figures/tuto4_genericity_and_algorithms-3.pbm b/milena/doc/figures/tuto4_genericity_and_algorithms-3.pbm index e6018c1..4a4e81b 100644 --- a/milena/doc/figures/tuto4_genericity_and_algorithms-3.pbm +++ b/milena/doc/figures/tuto4_genericity_and_algorithms-3.pbm @@ -1,5 +1,5 @@ P4 -# Generated by Olena 2.0a (http://olena.lrde.epita.fr) +# Generated by Olena 2.1 (http://olena.lrde.epita.fr) # EPITA Research and Development Laboratory (LRDE) 64 64 ��������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������� \ No newline at end of file diff --git a/milena/doc/figures/tuto4_genericity_and_algorithms-4.ppm b/milena/doc/figures/tuto4_genericity_and_algorithms-4.ppm index 222a859..6c2daa4 100644 Binary files a/milena/doc/figures/tuto4_genericity_and_algorithms-4.ppm and b/milena/doc/figures/tuto4_genericity_and_algorithms-4.ppm differ diff --git a/milena/doc/figures/tuto4_genericity_and_algorithms-5.ppm b/milena/doc/figures/tuto4_genericity_and_algorithms-5.ppm index b3cfb27..41c6830 100644 Binary files a/milena/doc/figures/tuto4_genericity_and_algorithms-5.ppm and b/milena/doc/figures/tuto4_genericity_and_algorithms-5.ppm differ diff --git a/milena/doc/figures/tuto4_genericity_and_algorithms-6.ppm b/milena/doc/figures/tuto4_genericity_and_algorithms-6.ppm index b63f745..a16fecd 100644 Binary files a/milena/doc/figures/tuto4_genericity_and_algorithms-6.ppm and b/milena/doc/figures/tuto4_genericity_and_algorithms-6.ppm differ diff --git a/milena/doc/milena.qhcp b/milena/doc/milena.qhcp index 1a4e7ca..e79f0ad 100644 --- a/milena/doc/milena.qhcp +++ b/milena/doc/milena.qhcp @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <QHelpCollectionProject version="1.0"> <assistant> - <startPage>qthelp://fr.epita.lrde.olena/milena-2.0/index.html</startPage> + <startPage>qthelp://fr.epita.lrde.olena/milena-2.1/index.html</startPage> </assistant> <docFiles> <register> <file>user-refman/html/milena.qch</file> </register> </docFiles> -</QHelpCollectionProject> \ No newline at end of file +</QHelpCollectionProject> diff --git a/milena/mln/version.hh b/milena/mln/version.hh index a043ae2..ea7aa43 100644 --- a/milena/mln/version.hh +++ b/milena/mln/version.hh @@ -27,10 +27,10 @@ #define OLN_PACKAGE_NAME "Olena" // The full name and version of this package. -#define OLN_PACKAGE_STRING "Olena 2.0a" +#define OLN_PACKAGE_STRING "Olena 2.1" /// The version of this package. -#define OLN_PACKAGE_VERSION "2.0a" +#define OLN_PACKAGE_VERSION "2.1" /// Home page for this package. #define OLN_PACKAGE_URL "http://olena.lrde.epita.fr" diff --git a/scribo/ChangeLog b/scribo/ChangeLog index b82b76d..456e710 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,14 @@ 2014-07-08 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Scribo 2.1. + + * scribo/NEWS, + * scribo/doc/Doxyfile.in, + * scribo/doc/scribo.qhcp: + Update version number. + +2014-07-08 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Update copyright notices in Scribo. * README, diff --git a/scribo/NEWS b/scribo/NEWS index e8418e2..db20151 100644 --- a/scribo/NEWS +++ b/scribo/NEWS @@ -1,4 +1,4 @@ -* Scribo 2.0a +* Scribo 2.1 July 8, 2014 * The Scribo distribution now contains a Doxygen documentation. diff --git a/scribo/doc/Doxyfile.in b/scribo/doc/Doxyfile.in index a3106ea..f40e288 100644 --- a/scribo/doc/Doxyfile.in +++ b/scribo/doc/Doxyfile.in @@ -375,7 +375,7 @@ SEARCHENGINE = YES GENERATE_QHP = yes QHP_NAMESPACE = "fr.epita.lrde.olena.scribo" -QHP_VIRTUAL_FOLDER = "scribo-2.0" +QHP_VIRTUAL_FOLDER = "scribo-2.1" QCH_FILE = "@builddir@/scribo.qch" QHG_LOCATION = "qhelpgenerator" diff --git a/scribo/doc/scribo.qhcp b/scribo/doc/scribo.qhcp index 77269b5..84f8e4a 100644 --- a/scribo/doc/scribo.qhcp +++ b/scribo/doc/scribo.qhcp @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <QHelpCollectionProject version="1.0"> <assistant> - <startPage>qthelp://fr.epita.lrde.olena/scribo-2.0/index.html</startPage> + <startPage>qthelp://fr.epita.lrde.olena/scribo-2.1/index.html</startPage> </assistant> <docFiles> <register> <file>user-refman/html/scribo.qch</file> </register> </docFiles> -</QHelpCollectionProject> \ No newline at end of file +</QHelpCollectionProject> diff --git a/swilena/ChangeLog b/swilena/ChangeLog index aa75870..6b98a95 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,9 @@ +2014-07-08 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + + Swilena 2.1. + + * swilena/NEWS: Update version number. + 2014-07-02 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; Add a NEWS file to Swilena. diff --git a/swilena/NEWS b/swilena/NEWS index 7d6e09f..acbf57d 100644 --- a/swilena/NEWS +++ b/swilena/NEWS @@ -1,4 +1,4 @@ -* Swilena 2.0a +* Swilena 2.1 July 8, 2014 * Improved compatibility with all versions of SWIG 2 and Python 2. -- 1.7.10.4