From: <ai...@us...> - 2014-02-12 22:19:38
|
Revision: 13008 http://sourceforge.net/p/plplot/code/13008 Author: airwin Date: 2014-02-12 22:19:33 +0000 (Wed, 12 Feb 2014) Log Message: ----------- Merge r13004 through r13007 from trunk. Revision Links: -------------- http://sourceforge.net/p/plplot/code/13004 http://sourceforge.net/p/plplot/code/13007 Modified Paths: -------------- tags/v5_10_0/ChangeLog.release tags/v5_10_0/README.Release_Manager_Cookbook tags/v5_10_0/scripts/htdocs-gen_plot-examples.sh tags/v5_10_0/www/examples.php Property Changed: ---------------- tags/v5_10_0/ tags/v5_10_0/bindings/java/PLCallbackMapform.java tags/v5_10_0/bindings/ocaml/META.in tags/v5_10_0/bindings/ocaml/plcairo/META.in tags/v5_10_0/bindings/qt_gui/pyqt4/ tags/v5_10_0/bindings/qt_gui/pyqt4/plplot_pyqt4.sip tags/v5_10_0/cmake/modules/language_support/cmake/CMakeAdaCompiler.cmake.in tags/v5_10_0/cmake/modules/language_support/cmake/CMakeAdaInformation.cmake tags/v5_10_0/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in tags/v5_10_0/cmake/modules/language_support/cmake/CMakeDInformation.cmake tags/v5_10_0/cmake/modules/language_support/cmake/CMakeD_Copyright.txt tags/v5_10_0/cmake/modules/language_support/cmake/CMakeDetermineAdaCompiler.cmake tags/v5_10_0/cmake/modules/language_support/cmake/CMakeDetermineDCompiler.cmake tags/v5_10_0/cmake/modules/language_support/cmake/CMakeTestAdaCompiler.cmake tags/v5_10_0/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake tags/v5_10_0/cmake/modules/language_support/cmake/Platform/ tags/v5_10_0/debian/ tags/v5_10_0/doc/Doxyfile.in tags/v5_10_0/drivers/test-drv-info.c tags/v5_10_0/examples/Makefile.examples.in tags/v5_10_0/examples/c/README.cairo tags/v5_10_0/examples/c/ext-cairo-test.c tags/v5_10_0/examples/c/extXdrawable_demo.c tags/v5_10_0/examples/octave/ tags/v5_10_0/examples/python/pyqt4_example.py tags/v5_10_0/examples/tk/plgrid.in tags/v5_10_0/examples/tk/plserver_standard_examples.in tags/v5_10_0/examples/tk/tk01.in tags/v5_10_0/examples/tk/tk02.in tags/v5_10_0/examples/tk/tk03.in tags/v5_10_0/examples/tk/tk04.in tags/v5_10_0/include/pldll.h.in tags/v5_10_0/include/qt.h tags/v5_10_0/lib/qsastime/qsastime.c tags/v5_10_0/lib/qsastime/qsastime.h tags/v5_10_0/lib/qsastime/qsastime.html tags/v5_10_0/lib/qsastime/qsastime.txt tags/v5_10_0/lib/qsastime/qsastime.xml tags/v5_10_0/lib/qsastime/qsastimeP.h.in tags/v5_10_0/lib/qsastime/qsastime_extra.c tags/v5_10_0/lib/qsastime/qsastime_extra.h tags/v5_10_0/lib/qsastime/qsastime_test.c tags/v5_10_0/plplot_test/test_octave_interactive.sh.in tags/v5_10_0/plplot_test/test_pdl.sh.in tags/v5_10_0/www/css/style.css.in tags/v5_10_0/www/img/plplot_logo.jpg Index: tags/v5_10_0 =================================================================== --- tags/v5_10_0 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0 ___________________________________________________________________ Added: svn:mergeinfo ## -0,0 +1 ## +/trunk:13004-13007 \ No newline at end of property Modified: tags/v5_10_0/ChangeLog.release =================================================================== --- tags/v5_10_0/ChangeLog.release 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/ChangeLog.release 2014-02-12 22:19:33 UTC (rev 13008) @@ -1,4 +1,28 @@ ------------------------------------------------------------------------ +r13006 | airwin | 2014-02-12 14:02:43 -0800 (Wed, 12 Feb 2014) | 2 lines +Changed paths: + M /trunk/README.Release_Manager_Cookbook + +More version tweaks to release process procedure. + +------------------------------------------------------------------------ +r13005 | airwin | 2014-02-12 14:01:26 -0800 (Wed, 12 Feb 2014) | 4 lines +Changed paths: + M /trunk/scripts/htdocs-gen_plot-examples.sh + M /trunk/www/examples.php + +Use ".txt" suffix rather than "-" since that appears to give +a better result with konqueror (which e.g., attempts to recognize +x00c.c- as C code which should be downloaded rather than simply viewed). + +------------------------------------------------------------------------ +r13003 | airwin | 2014-02-12 11:40:32 -0800 (Wed, 12 Feb 2014) | 2 lines +Changed paths: + M /trunk/ChangeLog.release + +Commit the ChangeLog for the 5.9.10 release. + +------------------------------------------------------------------------ r13002 | airwin | 2014-02-12 11:36:50 -0800 (Wed, 12 Feb 2014) | 3 lines Changed paths: M /trunk/README.Release_Manager_Cookbook Modified: tags/v5_10_0/README.Release_Manager_Cookbook =================================================================== --- tags/v5_10_0/README.Release_Manager_Cookbook 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/README.Release_Manager_Cookbook 2014-02-12 22:19:33 UTC (rev 13008) @@ -385,6 +385,10 @@ Note the order of the --revision components which puts this file in the traditional reverse chronological order (unlike the preliminary version above which is in chronological order). + +Commit the result which ideally should be the last commit of this release. + +svn commit ChangeLog.release _________________________________________________________________________ ** Create the PLplot Release @@ -399,7 +403,7 @@ /branches/?? For the release, you will be using svn to copy the /trunk version to -/tags/vX_Y_Z (v5_9_11 for example to follow the previous naming +/tags/vX_Y_Z (v5_10_0 for example to follow the previous naming conventions). To do this strictly on the server side with no local files involved at all @@ -411,11 +415,11 @@ svn status # Complete server side copy using new SourceForge Allura version of repository. # This is _much_ faster than copying from the local version. -svn copy https://svn.code.sf.net/p/plplot/code/trunk https://svn.code.sf.net/p/plplot/code/tags/v5_9_11 +svn copy https://svn.code.sf.net/p/plplot/code/trunk https://svn.code.sf.net/p/plplot/code/tags/v5_10_0 # Check out this release tag -svn checkout https://svn.code.sf.net/p/plplot/code/tags/v5_9_11 plplot_tags_5.10.0 +svn checkout https://svn.code.sf.net/p/plplot/code/tags/v5_10_0 plplot_tags_5.10.0 In the event that problems are found in the release tarball generated from the release tag, then trunk should be fixed, the trunk Index: tags/v5_10_0/bindings/java/PLCallbackMapform.java =================================================================== --- tags/v5_10_0/bindings/java/PLCallbackMapform.java 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/bindings/java/PLCallbackMapform.java 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/bindings/java/PLCallbackMapform.java ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/bindings/ocaml/META.in =================================================================== --- tags/v5_10_0/bindings/ocaml/META.in 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/bindings/ocaml/META.in 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/bindings/ocaml/META.in ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/bindings/ocaml/plcairo/META.in =================================================================== --- tags/v5_10_0/bindings/ocaml/plcairo/META.in 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/bindings/ocaml/plcairo/META.in 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/bindings/ocaml/plcairo/META.in ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/bindings/qt_gui/pyqt4 =================================================================== --- tags/v5_10_0/bindings/qt_gui/pyqt4 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/bindings/qt_gui/pyqt4 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/bindings/qt_gui/pyqt4 ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/bindings/qt_gui/pyqt4/plplot_pyqt4.sip =================================================================== --- tags/v5_10_0/bindings/qt_gui/pyqt4/plplot_pyqt4.sip 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/bindings/qt_gui/pyqt4/plplot_pyqt4.sip 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/bindings/qt_gui/pyqt4/plplot_pyqt4.sip ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/cmake/modules/language_support/cmake/CMakeAdaCompiler.cmake.in =================================================================== --- tags/v5_10_0/cmake/modules/language_support/cmake/CMakeAdaCompiler.cmake.in 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/cmake/modules/language_support/cmake/CMakeAdaCompiler.cmake.in 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/cmake/modules/language_support/cmake/CMakeAdaCompiler.cmake.in ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/cmake/modules/language_support/cmake/CMakeAdaInformation.cmake =================================================================== --- tags/v5_10_0/cmake/modules/language_support/cmake/CMakeAdaInformation.cmake 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/cmake/modules/language_support/cmake/CMakeAdaInformation.cmake 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/cmake/modules/language_support/cmake/CMakeAdaInformation.cmake ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in =================================================================== --- tags/v5_10_0/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/cmake/modules/language_support/cmake/CMakeDInformation.cmake =================================================================== --- tags/v5_10_0/cmake/modules/language_support/cmake/CMakeDInformation.cmake 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/cmake/modules/language_support/cmake/CMakeDInformation.cmake 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/cmake/modules/language_support/cmake/CMakeDInformation.cmake ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/cmake/modules/language_support/cmake/CMakeD_Copyright.txt =================================================================== --- tags/v5_10_0/cmake/modules/language_support/cmake/CMakeD_Copyright.txt 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/cmake/modules/language_support/cmake/CMakeD_Copyright.txt 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/cmake/modules/language_support/cmake/CMakeD_Copyright.txt ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/cmake/modules/language_support/cmake/CMakeDetermineAdaCompiler.cmake =================================================================== --- tags/v5_10_0/cmake/modules/language_support/cmake/CMakeDetermineAdaCompiler.cmake 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/cmake/modules/language_support/cmake/CMakeDetermineAdaCompiler.cmake 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/cmake/modules/language_support/cmake/CMakeDetermineAdaCompiler.cmake ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/cmake/modules/language_support/cmake/CMakeDetermineDCompiler.cmake =================================================================== --- tags/v5_10_0/cmake/modules/language_support/cmake/CMakeDetermineDCompiler.cmake 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/cmake/modules/language_support/cmake/CMakeDetermineDCompiler.cmake 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/cmake/modules/language_support/cmake/CMakeDetermineDCompiler.cmake ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/cmake/modules/language_support/cmake/CMakeTestAdaCompiler.cmake =================================================================== --- tags/v5_10_0/cmake/modules/language_support/cmake/CMakeTestAdaCompiler.cmake 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/cmake/modules/language_support/cmake/CMakeTestAdaCompiler.cmake 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/cmake/modules/language_support/cmake/CMakeTestAdaCompiler.cmake ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake =================================================================== --- tags/v5_10_0/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/cmake/modules/language_support/cmake/Platform =================================================================== --- tags/v5_10_0/cmake/modules/language_support/cmake/Platform 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/cmake/modules/language_support/cmake/Platform 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/cmake/modules/language_support/cmake/Platform ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/debian =================================================================== --- tags/v5_10_0/debian 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/debian 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/debian ___________________________________________________________________ Modified: svn:mergeinfo ## -2,3 +2,4 ## /branches/v5_9_6_debian/debian:11125-11630 /branches/v5_9_7_debian/debian:11631-11840 /branches/v5_9_8_debian/debian:11840-12002 +/trunk/debian:13004-13007 \ No newline at end of property Index: tags/v5_10_0/doc/Doxyfile.in =================================================================== --- tags/v5_10_0/doc/Doxyfile.in 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/doc/Doxyfile.in 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/doc/Doxyfile.in ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/drivers/test-drv-info.c =================================================================== --- tags/v5_10_0/drivers/test-drv-info.c 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/drivers/test-drv-info.c 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/drivers/test-drv-info.c ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/examples/Makefile.examples.in =================================================================== --- tags/v5_10_0/examples/Makefile.examples.in 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/examples/Makefile.examples.in 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/examples/Makefile.examples.in ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/examples/c/README.cairo =================================================================== --- tags/v5_10_0/examples/c/README.cairo 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/examples/c/README.cairo 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/examples/c/README.cairo ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/examples/c/ext-cairo-test.c =================================================================== --- tags/v5_10_0/examples/c/ext-cairo-test.c 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/examples/c/ext-cairo-test.c 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/examples/c/ext-cairo-test.c ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/examples/c/extXdrawable_demo.c =================================================================== --- tags/v5_10_0/examples/c/extXdrawable_demo.c 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/examples/c/extXdrawable_demo.c 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/examples/c/extXdrawable_demo.c ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/examples/octave =================================================================== --- tags/v5_10_0/examples/octave 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/examples/octave 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/examples/octave ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/examples/python/pyqt4_example.py =================================================================== --- tags/v5_10_0/examples/python/pyqt4_example.py 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/examples/python/pyqt4_example.py 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/examples/python/pyqt4_example.py ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/examples/tk/plgrid.in =================================================================== --- tags/v5_10_0/examples/tk/plgrid.in 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/examples/tk/plgrid.in 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/examples/tk/plgrid.in ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/examples/tk/plserver_standard_examples.in =================================================================== --- tags/v5_10_0/examples/tk/plserver_standard_examples.in 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/examples/tk/plserver_standard_examples.in 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/examples/tk/plserver_standard_examples.in ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/examples/tk/tk01.in =================================================================== --- tags/v5_10_0/examples/tk/tk01.in 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/examples/tk/tk01.in 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/examples/tk/tk01.in ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/examples/tk/tk02.in =================================================================== --- tags/v5_10_0/examples/tk/tk02.in 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/examples/tk/tk02.in 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/examples/tk/tk02.in ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/examples/tk/tk03.in =================================================================== --- tags/v5_10_0/examples/tk/tk03.in 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/examples/tk/tk03.in 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/examples/tk/tk03.in ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/examples/tk/tk04.in =================================================================== --- tags/v5_10_0/examples/tk/tk04.in 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/examples/tk/tk04.in 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/examples/tk/tk04.in ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/include/pldll.h.in =================================================================== --- tags/v5_10_0/include/pldll.h.in 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/include/pldll.h.in 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/include/pldll.h.in ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/include/qt.h =================================================================== --- tags/v5_10_0/include/qt.h 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/include/qt.h 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/include/qt.h ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/lib/qsastime/qsastime.c =================================================================== --- tags/v5_10_0/lib/qsastime/qsastime.c 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/lib/qsastime/qsastime.c 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/lib/qsastime/qsastime.c ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/lib/qsastime/qsastime.h =================================================================== --- tags/v5_10_0/lib/qsastime/qsastime.h 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/lib/qsastime/qsastime.h 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/lib/qsastime/qsastime.h ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/lib/qsastime/qsastime.html =================================================================== --- tags/v5_10_0/lib/qsastime/qsastime.html 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/lib/qsastime/qsastime.html 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/lib/qsastime/qsastime.html ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/lib/qsastime/qsastime.txt =================================================================== --- tags/v5_10_0/lib/qsastime/qsastime.txt 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/lib/qsastime/qsastime.txt 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/lib/qsastime/qsastime.txt ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/lib/qsastime/qsastime.xml =================================================================== --- tags/v5_10_0/lib/qsastime/qsastime.xml 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/lib/qsastime/qsastime.xml 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/lib/qsastime/qsastime.xml ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/lib/qsastime/qsastimeP.h.in =================================================================== --- tags/v5_10_0/lib/qsastime/qsastimeP.h.in 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/lib/qsastime/qsastimeP.h.in 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/lib/qsastime/qsastimeP.h.in ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/lib/qsastime/qsastime_extra.c =================================================================== --- tags/v5_10_0/lib/qsastime/qsastime_extra.c 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/lib/qsastime/qsastime_extra.c 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/lib/qsastime/qsastime_extra.c ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/lib/qsastime/qsastime_extra.h =================================================================== --- tags/v5_10_0/lib/qsastime/qsastime_extra.h 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/lib/qsastime/qsastime_extra.h 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/lib/qsastime/qsastime_extra.h ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/lib/qsastime/qsastime_test.c =================================================================== --- tags/v5_10_0/lib/qsastime/qsastime_test.c 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/lib/qsastime/qsastime_test.c 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/lib/qsastime/qsastime_test.c ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/plplot_test/test_octave_interactive.sh.in =================================================================== --- tags/v5_10_0/plplot_test/test_octave_interactive.sh.in 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/plplot_test/test_octave_interactive.sh.in 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/plplot_test/test_octave_interactive.sh.in ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Index: tags/v5_10_0/plplot_test/test_pdl.sh.in =================================================================== --- tags/v5_10_0/plplot_test/test_pdl.sh.in 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/plplot_test/test_pdl.sh.in 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/plplot_test/test_pdl.sh.in ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Modified: tags/v5_10_0/scripts/htdocs-gen_plot-examples.sh =================================================================== --- tags/v5_10_0/scripts/htdocs-gen_plot-examples.sh 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/scripts/htdocs-gen_plot-examples.sh 2014-02-12 22:19:33 UTC (rev 13008) @@ -164,7 +164,7 @@ *.py \ *.tcl \ ; do - mv $j $j- + mv $j $j.txt done ) Index: tags/v5_10_0/www/css/style.css.in =================================================================== --- tags/v5_10_0/www/css/style.css.in 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/www/css/style.css.in 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/www/css/style.css.in ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property Modified: tags/v5_10_0/www/examples.php =================================================================== --- tags/v5_10_0/www/examples.php 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/www/examples.php 2014-02-12 22:19:33 UTC (rev 13008) @@ -180,17 +180,17 @@ END; switch($lbind) { - case ("Ada(thick)"): $fname = "xthick" . $demo_str . "a.adb-"; break; - case ("Ada(thin)"): $fname = "x" . $demo_str . "a.adb-"; break; - case ("C"): $fname = "x" . $demo_str . "c.c-"; break; - case ("C++"):$fname = "x" . $demo_str . ".cc-"; break; - case ("F95"): $fname = "x" . $demo_str . "f.f90-"; break; - case ("Java"): $fname = "x" . $demo_str . ".java-"; break; - case ("Ocaml"): $fname = "x" . $demo_str . ".ml-"; break; - case ("Octave"): $fname = "x" . $demo_str . "c.m-"; break; - case ("Python"): $fname = "xw" . $demo_str . ".py-"; break; - case ("Tcl"): $fname = "x" . $demo_str . ".tcl-"; break; - default: $fname = "x" . $demo_str . "c.c-"; + case ("Ada(thick)"): $fname = "xthick" . $demo_str . "a.adb.txt-"; break; + case ("Ada(thin)"): $fname = "x" . $demo_str . "a.adb.txt"; break; + case ("C"): $fname = "x" . $demo_str . "c.c.txt"; break; + case ("C++"):$fname = "x" . $demo_str . ".cc.txt"; break; + case ("F95"): $fname = "x" . $demo_str . "f.f90.txt"; break; + case ("Java"): $fname = "x" . $demo_str . ".java.txt"; break; + case ("Ocaml"): $fname = "x" . $demo_str . ".ml.txt"; break; + case ("Octave"): $fname = "x" . $demo_str . "c.m.txt"; break; + case ("Python"): $fname = "xw" . $demo_str . ".py.txt"; break; + case ("Tcl"): $fname = "x" . $demo_str . ".tcl.txt"; break; + default: $fname = "x" . $demo_str . "c.c.txt"; } // view code Index: tags/v5_10_0/www/img/plplot_logo.jpg =================================================================== --- tags/v5_10_0/www/img/plplot_logo.jpg 2014-02-12 22:06:04 UTC (rev 13007) +++ tags/v5_10_0/www/img/plplot_logo.jpg 2014-02-12 22:19:33 UTC (rev 13008) Property changes on: tags/v5_10_0/www/img/plplot_logo.jpg ___________________________________________________________________ Deleted: svn:mergeinfo \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |