From: <br...@us...> - 2009-07-05 03:14:04
|
Revision: 3953 http://openvrml.svn.sourceforge.net/openvrml/?rev=3953&view=rev Author: braden Date: 2009-07-05 03:14:03 +0000 (Sun, 05 Jul 2009) Log Message: ----------- Applied OPENVRML_API to event listener/emitter class templates. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/src/libopenvrml/openvrml/event.h Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2009-07-05 03:11:15 UTC (rev 3952) +++ branches/0.18/ChangeLog 2009-07-05 03:14:03 UTC (rev 3953) @@ -1,5 +1,14 @@ 2009-07-04 Braden McDaniel <br...@en...> + Applied OPENVRML_API to event listener/emitter class templates. + + * src/libopenvrml/openvrml/event.h + (field_value_listener): Applied OPENVRML_API. + (node_field_value_listener): Applied OPENVRML_API. + (field_value_emitter): Applied OPENVRML_API. + +2009-07-04 Braden McDaniel <br...@en...> + Updates for 0.18.0 release. * README Modified: branches/0.18/src/libopenvrml/openvrml/event.h =================================================================== --- branches/0.18/src/libopenvrml/openvrml/event.h 2009-07-05 03:11:15 UTC (rev 3952) +++ branches/0.18/src/libopenvrml/openvrml/event.h 2009-07-05 03:14:03 UTC (rev 3953) @@ -57,7 +57,7 @@ template <typename FieldValue> - class field_value_listener : public virtual event_listener { + class OPENVRML_API field_value_listener : public virtual event_listener { BOOST_CLASS_REQUIRE(FieldValue, openvrml, FieldValueConcept); public: @@ -133,7 +133,7 @@ template <typename FieldValue> - class node_field_value_listener : + class OPENVRML_API node_field_value_listener : public virtual node_event_listener, public field_value_listener<FieldValue> { public: @@ -240,7 +240,7 @@ template <typename FieldValue> - class field_value_emitter : public virtual event_emitter { + class OPENVRML_API field_value_emitter : public virtual event_emitter { BOOST_CLASS_REQUIRE(FieldValue, openvrml, FieldValueConcept); public: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2009-07-05 21:19:01
|
Revision: 3955 http://openvrml.svn.sourceforge.net/openvrml/?rev=3955&view=rev Author: braden Date: 2009-07-05 21:19:00 +0000 (Sun, 05 Jul 2009) Log Message: ----------- Updates for 0.18.1 release. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/NEWS branches/0.18/README branches/0.18/configure.ac branches/0.18/doc/Doxyfile branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc branches/0.18/src/Makefile.am Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2009-07-05 03:17:38 UTC (rev 3954) +++ branches/0.18/ChangeLog 2009-07-05 21:19:00 UTC (rev 3955) @@ -1,3 +1,17 @@ +2009-07-05 Braden McDaniel <br...@en...> + + Updates for 0.18.1 release. + + * README + * NEWS + * configure.ac + * doc/Doxyfile + * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc + * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj + * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc + * src/Makefile.am + (LIBOPENVRML_LIBRARY_VERSION): Updated to 9:1:0. + 2009-07-04 Braden McDaniel <br...@en...> Applied OPENVRML_API to event listener/emitter class templates. Modified: branches/0.18/NEWS =================================================================== --- branches/0.18/NEWS 2009-07-05 03:17:38 UTC (rev 3954) +++ branches/0.18/NEWS 2009-07-05 21:19:00 UTC (rev 3955) @@ -1,3 +1,10 @@ +Changes new in version 0.18.1, 5 July, 2009 +======================================================================== + +- Fixed an issue with symbol visibility for the event emitter/listener + class templates. + + Changes new in version 0.18.0, 4 July, 2009 ======================================================================== Modified: branches/0.18/README =================================================================== --- branches/0.18/README 2009-07-05 03:17:38 UTC (rev 3954) +++ branches/0.18/README 2009-07-05 21:19:00 UTC (rev 3955) @@ -1,4 +1,4 @@ -OpenVRML library version 0.18.0 +OpenVRML library version 0.18.1 Copyright 1998, 1999, 2000 Chris Morley <cm...@ve...> Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Braden McDaniel <br...@en...> Modified: branches/0.18/configure.ac =================================================================== --- branches/0.18/configure.ac 2009-07-05 03:17:38 UTC (rev 3954) +++ branches/0.18/configure.ac 2009-07-05 21:19:00 UTC (rev 3955) @@ -1,4 +1,4 @@ -AC_INIT([OpenVRML], [0.18.0], [ope...@li...]) +AC_INIT([OpenVRML], [0.18.1], [ope...@li...]) AC_PREREQ([2.59]) AC_COPYRIGHT([Portions copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Braden McDaniel]) AC_CONFIG_MACRO_DIR([m4]) Modified: branches/0.18/doc/Doxyfile =================================================================== --- branches/0.18/doc/Doxyfile 2009-07-05 03:17:38 UTC (rev 3954) +++ branches/0.18/doc/Doxyfile 2009-07-05 21:19:00 UTC (rev 3955) @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = OpenVRML -PROJECT_NUMBER = 0.18.0 +PROJECT_NUMBER = 0.18.1 OUTPUT_DIRECTORY = CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English Modified: branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc =================================================================== --- branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc 2009-07-05 03:17:38 UTC (rev 3954) +++ branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc 2009-07-05 21:19:00 UTC (rev 3955) @@ -11,8 +11,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 9,0,0,0 - PRODUCTVERSION 0,18,0,0 + FILEVERSION 9,1,0,0 + PRODUCTVERSION 0,18,1,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -28,12 +28,12 @@ BLOCK "040904b0" BEGIN VALUE "FileDescription", "OpenVRML Library" - VALUE "FileVersion", "9, 0, 0, 0" + VALUE "FileVersion", "9, 1, 0, 0" VALUE "InternalName", "openvrml" VALUE "LegalCopyright", "Copyright (C) 2009" VALUE "OriginalFilename", "openvrml.dll" VALUE "ProductName", "OpenVRML Library" - VALUE "ProductVersion", "0.18.0" + VALUE "ProductVersion", "0.18.1" END END BLOCK "VarFileInfo" Modified: branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj =================================================================== --- branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj 2009-07-05 03:17:38 UTC (rev 3954) +++ branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj 2009-07-05 21:19:00 UTC (rev 3955) @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\src\node" - PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION=\"0.18.0\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\"\";OPENVRML_PKGLIBDIR_=\"\"" + PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION=\"0.18.1\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\"\";OPENVRML_PKGLIBDIR_=\"\"" MinimalRebuild="false" BasicRuntimeChecks="0" RuntimeLibrary="3" @@ -127,7 +127,7 @@ InlineFunctionExpansion="1" OmitFramePointers="true" AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\src\node" - PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;PACKAGE_VERSION=\"0.18.0\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\"\";OPENVRML_PKGLIBDIR_=\"\";NDEBUG" + PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;PACKAGE_VERSION=\"0.18.1\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\"\";OPENVRML_PKGLIBDIR_=\"\";NDEBUG" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" Modified: branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc =================================================================== --- branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc 2009-07-05 03:17:38 UTC (rev 3954) +++ branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc 2009-07-05 21:19:00 UTC (rev 3955) @@ -12,7 +12,7 @@ VS_VERSION_INFO VERSIONINFO FILEVERSION 8,0,0,0 - PRODUCTVERSION 0,18,0,0 + PRODUCTVERSION 0,18,1,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -33,7 +33,7 @@ VALUE "LegalCopyright", "Copyright (C) 2009" VALUE "OriginalFilename", "openvrml-gl.dll" VALUE "ProductName", "OpenVRML Library" - VALUE "ProductVersion", "0.18.0" + VALUE "ProductVersion", "0.18.1" END END BLOCK "VarFileInfo" Modified: branches/0.18/src/Makefile.am =================================================================== --- branches/0.18/src/Makefile.am 2009-07-05 03:17:38 UTC (rev 3954) +++ branches/0.18/src/Makefile.am 2009-07-05 21:19:00 UTC (rev 3955) @@ -46,7 +46,7 @@ libopenvrml/private.h \ openvrml-player/filechooserdialog.h -LIBOPENVRML_LIBRARY_VERSION = 9:0:0 +LIBOPENVRML_LIBRARY_VERSION = 9:1:0 LIBOPENVRML_GL_LIBRARY_VERSION = 8:0:0 # | | | # +------+ | +---+ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2009-07-07 04:59:27
|
Revision: 3959 http://openvrml.svn.sourceforge.net/openvrml/?rev=3959&view=rev Author: braden Date: 2009-07-07 04:59:16 +0000 (Tue, 07 Jul 2009) Log Message: ----------- Added ppc, ppc64 awareness to search path for libjvm. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/configure.ac Property Changed: ---------------- branches/0.18/ branches/0.18/src/libopenvrml/openvrml/bad_url.cpp branches/0.18/src/libopenvrml/openvrml/bad_url.h branches/0.18/src/libopenvrml/openvrml/local/proto.cpp branches/0.18/src/libopenvrml/openvrml/local/proto.h branches/0.18/src/libopenvrml/openvrml/scene.cpp branches/0.18/src/libopenvrml/openvrml/scene.h branches/0.18/src/libopenvrml/openvrml/script.cpp branches/0.18/src/mozilla-plugin/ branches/0.18/src/node/vrml97/register_node_metatypes.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.h branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp branches/0.18/src/node/x3d-core/metadata_double.cpp branches/0.18/src/node/x3d-core/metadata_double.h branches/0.18/src/node/x3d-core/metadata_float.cpp branches/0.18/src/node/x3d-core/metadata_float.h branches/0.18/src/node/x3d-core/metadata_integer.cpp branches/0.18/src/node/x3d-core/metadata_integer.h branches/0.18/src/node/x3d-core/metadata_set.cpp branches/0.18/src/node/x3d-core/metadata_set.h branches/0.18/src/node/x3d-core/metadata_string.cpp branches/0.18/src/node/x3d-core/metadata_string.h branches/0.18/src/node/x3d-core/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/espdu_transform.cpp branches/0.18/src/node/x3d-dis/espdu_transform.h branches/0.18/src/node/x3d-dis/receiver_pdu.cpp branches/0.18/src/node/x3d-dis/receiver_pdu.h branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/signal_pdu.cpp branches/0.18/src/node/x3d-dis/signal_pdu.h branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp branches/0.18/src/node/x3d-dis/transmitter_pdu.h branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.h branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp branches/0.18/src/node/x3d-event-utilities/boolean_filter.h branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp branches/0.18/src/node/x3d-event-utilities/integer_trigger.h branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.h branches/0.18/src/node/x3d-geometry2d/arc2d.cpp branches/0.18/src/node/x3d-geometry2d/arc2d.h branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp branches/0.18/src/node/x3d-geometry2d/arc_close2d.h branches/0.18/src/node/x3d-geometry2d/circle2d.cpp branches/0.18/src/node/x3d-geometry2d/circle2d.h branches/0.18/src/node/x3d-geometry2d/disk2d.cpp branches/0.18/src/node/x3d-geometry2d/disk2d.h branches/0.18/src/node/x3d-geometry2d/polyline2d.cpp branches/0.18/src/node/x3d-geometry2d/polyline2d.h branches/0.18/src/node/x3d-geometry2d/polypoint2d.cpp branches/0.18/src/node/x3d-geometry2d/polypoint2d.h branches/0.18/src/node/x3d-geometry2d/rectangle2d.cpp branches/0.18/src/node/x3d-geometry2d/rectangle2d.h branches/0.18/src/node/x3d-geometry2d/register_node_metatypes.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.h branches/0.18/src/node/x3d-geospatial/geo_coordinate.cpp branches/0.18/src/node/x3d-geospatial/geo_coordinate.h branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.cpp branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.h branches/0.18/src/node/x3d-geospatial/geo_location.cpp branches/0.18/src/node/x3d-geospatial/geo_location.h branches/0.18/src/node/x3d-geospatial/geo_lod.cpp branches/0.18/src/node/x3d-geospatial/geo_lod.h branches/0.18/src/node/x3d-geospatial/geo_metadata.cpp branches/0.18/src/node/x3d-geospatial/geo_metadata.h branches/0.18/src/node/x3d-geospatial/geo_origin.cpp branches/0.18/src/node/x3d-geospatial/geo_origin.h branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.cpp branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.h branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.cpp branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.h branches/0.18/src/node/x3d-geospatial/geo_viewpoint.cpp branches/0.18/src/node/x3d-geospatial/geo_viewpoint.h branches/0.18/src/node/x3d-geospatial/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/static_group.cpp branches/0.18/src/node/x3d-grouping/static_group.h branches/0.18/src/node/x3d-h-anim/h_anim_displacer.cpp branches/0.18/src/node/x3d-h-anim/h_anim_displacer.h branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.cpp branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.h branches/0.18/src/node/x3d-h-anim/h_anim_joint.cpp branches/0.18/src/node/x3d-h-anim/h_anim_joint.h branches/0.18/src/node/x3d-h-anim/h_anim_segment.cpp branches/0.18/src/node/x3d-h-anim/h_anim_segment.h branches/0.18/src/node/x3d-h-anim/h_anim_site.cpp branches/0.18/src/node/x3d-h-anim/h_anim_site.h branches/0.18/src/node/x3d-h-anim/register_node_metatypes.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.h branches/0.18/src/node/x3d-interpolation/position_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/position_interpolator2d.h branches/0.18/src/node/x3d-interpolation/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.h branches/0.18/src/node/x3d-key-device-sensor/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.h branches/0.18/src/node/x3d-networking/load_sensor.cpp branches/0.18/src/node/x3d-networking/load_sensor.h branches/0.18/src/node/x3d-networking/register_node_metatypes.cpp branches/0.18/src/node/x3d-nurbs/contour2d.cpp branches/0.18/src/node/x3d-nurbs/contour2d.h branches/0.18/src/node/x3d-nurbs/contour_polyline2d.cpp branches/0.18/src/node/x3d-nurbs/contour_polyline2d.h branches/0.18/src/node/x3d-nurbs/coordinate_double.cpp branches/0.18/src/node/x3d-nurbs/coordinate_double.h branches/0.18/src/node/x3d-nurbs/nurbs_curve.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve.h branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.h branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_set.cpp branches/0.18/src/node/x3d-nurbs/nurbs_set.h branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.h branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.h branches/0.18/src/node/x3d-nurbs/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/color_rgba.cpp branches/0.18/src/node/x3d-rendering/color_rgba.h branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.h branches/0.18/src/node/x3d-rendering/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.h branches/0.18/src/node/x3d-rendering/triangle_set.cpp branches/0.18/src/node/x3d-rendering/triangle_set.h branches/0.18/src/node/x3d-rendering/triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/triangle_strip_set.h branches/0.18/src/node/x3d-shape/fill_properties.cpp branches/0.18/src/node/x3d-shape/fill_properties.h branches/0.18/src/node/x3d-shape/line_properties.cpp branches/0.18/src/node/x3d-shape/line_properties.h branches/0.18/src/node/x3d-shape/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/multi_texture.cpp branches/0.18/src/node/x3d-texturing/multi_texture.h branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.cpp branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.h branches/0.18/src/node/x3d-texturing/multi_texture_transform.cpp branches/0.18/src/node/x3d-texturing/multi_texture_transform.h branches/0.18/src/node/x3d-texturing/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.h Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2009-07-07 04:55:50 UTC (rev 3958) +++ branches/0.18/ChangeLog 2009-07-07 04:59:16 UTC (rev 3959) @@ -1,3 +1,8 @@ +2009-07-07 Braden McDaniel <br...@en...> + + * configure.ac: Added ppc, ppc64 awareness to search path for + libjvm. + 2009-07-05 Braden McDaniel <br...@en...> Updates for 0.18.1 release. Modified: branches/0.18/configure.ac =================================================================== --- branches/0.18/configure.ac 2009-07-07 04:55:50 UTC (rev 3958) +++ branches/0.18/configure.ac 2009-07-07 04:59:16 UTC (rev 3959) @@ -359,9 +359,11 @@ [AC_HELP_STRING([--disable-script-node-java], [disable Script node Java support])]) case $target_cpu in - x86_64) OPENVRML_JVM_ARCH=amd64 ;; - i?86) OPENVRML_JVM_ARCH=i386 ;; - *) OPENVRML_JVM_ARCH=$target_cpu ;; + x86_64) OPENVRML_JVM_ARCH=amd64 ;; + i?86) OPENVRML_JVM_ARCH=i386 ;; + powerpc64) OPENVRML_JVM_ARCH=ppc64 ;; + powerpc) OPENVRML_JVM_ARCH=ppc ;; + *) OPENVRML_JVM_ARCH=$target_cpu ;; esac AC_SUBST([OPENVRML_JVM_ARCH]) AS_IF([test X$enable_script_node_java != Xno], Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958 Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 + /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958 Property changes on: branches/0.18/src/libopenvrml/openvrml/script.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958 Property changes on: branches/0.18/src/mozilla-plugin ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/src/mozilla-plugin:3958 Property changes on: branches/0.18/src/node/vrml97/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 + /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958 Property changes on: branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 + /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 + /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 + /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 + /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 + /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 + /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 + /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 + /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 + /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 + /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 + /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958 Property changes on: branches/0.18/src/node/x3d-core/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 + /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 + /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 + /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 + /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 + /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958 Property changes on: branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 + /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 + /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 + /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.h:3958 Property changes on: branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 + /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.cpp:3958 Property changes on: branches/0.18/src/node/x3d-dis/transmitter_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 + /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.h:3958 Property changes on: branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 + /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 /trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3958 Property changes on: branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 + /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.cpp:3958 Property changes on: branches/0.18/src/node/x3d-environmental-effects/texture_background.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 + /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.h:3958 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.cpp:3958 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_filter.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.h:3958 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp:3958 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.h:3958 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.cpp:3958 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.h:3958 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.cpp:3958 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.h:3958 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.cpp:3958 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.h:3958 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.cpp:3958 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/local/src/node/x3d-event-utilities/integer_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.h:3958 Property changes on: branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3734 + /branches/0.17/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3734 /trunk/src/node/x3d-event-utilities/register_node_metatypes.cpp:3958 Property changes on: branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/time_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/local/src/node/x3d-event-utilities/time_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/time_trigger.cpp:3958 Property changes on: branches/0.18/src/node/x3d-event-utilities/time_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/time_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/local/src/node/x3d-event-utilities/time_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/time_trigger.h:3958 Property changes on: branches/0.18/src/node/x3d-geometry2d/arc2d.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/arc2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 + /branches/local/src/node/x3d-geometry2d/arc2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc2d.cpp:3958 Property changes on: branches/0.18/src/node/x3d-geometry2d/arc2d.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/arc2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 + /branches/local/src/node/x3d-geometry2d/arc2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc2d.h:3958 Property changes on: branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/arc_close2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 + /branches/local/src/node/x3d-geometry2d/arc_close2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc_close2d.cpp:3958 Property changes on: branches/0.18/src/node/x3d-geometry2d/arc_close2d.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/arc_close2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 + /branches/local/src/node/x3d-geometry2d/arc_close2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc_close2d.h:3958 Property changes on: branches/0.18/src/node/x3d-geometry2d/circle2d.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/circle2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/circle2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 + /branches/local/src/node/x3d-geometry2d/circle2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/circle2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/circle2d.cpp:3958 Property changes on: branches/0.18/src/node/x3d-geometry2d/circle2d.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/circle2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/circle2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 + /branches/local/src/node/x3d-geometry2d/circle2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/circle2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/circle2d.h:3958 Property changes on: branches/0.18/src/node/x3d-geometry2d/disk2d.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/disk2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/disk2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 + /branches/local/src/node/x3d-geometry2d/disk2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/disk2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/disk2d.cpp:3958 Property changes on: branches/0.18/src/node/x3d-geometry2d/disk2d.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/disk2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/disk2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 + /branches/local/src/node/x3d-geometry2d/disk2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/disk2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/disk2d.h:3958 Property changes on: branches/0.18/src/node/x3d-geometry2d/polyline2d.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/polyline2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/polyline2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 + /branches/local/src/node/x3d-geometry2d/polyline2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/polyline2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/polyline2d.cpp:3958 Property changes on: branches/0.18/src/node/x3d-geometry2d/polyline2d.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/polyline2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/polyline2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 + /branches/local/src/node/x3d-geometry2d/polyline2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/polyline2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/polyline2d.h:3958 Property changes on: branches/0.18/src/node/x3d-geometry2d/polypoint2d.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/polypoint2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/polypoint2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 + /branches/local/src/node/x3d-geometry2d/polypoint2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/polypoint2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/polypoint2d.cpp:3958 Property changes on: branches/0.18/src/node/x3d-geometry2d/polypoint2d.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/polypoint2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/polypoint2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 + /branches/local/src/node/x3d-geometry2d/polypoint2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/polypoint2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvr... [truncated message content] |
From: <br...@us...> - 2009-07-07 05:38:06
|
Revision: 3960 http://openvrml.svn.sourceforge.net/openvrml/?rev=3960&view=rev Author: braden Date: 2009-07-07 05:37:45 +0000 (Tue, 07 Jul 2009) Log Message: ----------- Updates for 0.18.2 release. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/NEWS branches/0.18/README branches/0.18/configure.ac branches/0.18/doc/Doxyfile branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2009-07-07 04:59:16 UTC (rev 3959) +++ branches/0.18/ChangeLog 2009-07-07 05:37:45 UTC (rev 3960) @@ -1,5 +1,17 @@ 2009-07-07 Braden McDaniel <br...@en...> + Updates for 0.18.2 release. + + * README + * NEWS + * configure.ac + * doc/Doxyfile + * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc + * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj + * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc + +2009-07-07 Braden McDaniel <br...@en...> + * configure.ac: Added ppc, ppc64 awareness to search path for libjvm. Modified: branches/0.18/NEWS =================================================================== --- branches/0.18/NEWS 2009-07-07 04:59:16 UTC (rev 3959) +++ branches/0.18/NEWS 2009-07-07 05:37:45 UTC (rev 3960) @@ -1,3 +1,10 @@ +Changes new in version 0.18.2, 7 July, 2009 +======================================================================== + +- Fixed resolution of the Java virtual machine library for ppc and + ppc64. + + Changes new in version 0.18.1, 5 July, 2009 ======================================================================== Modified: branches/0.18/README =================================================================== --- branches/0.18/README 2009-07-07 04:59:16 UTC (rev 3959) +++ branches/0.18/README 2009-07-07 05:37:45 UTC (rev 3960) @@ -1,4 +1,4 @@ -OpenVRML library version 0.18.1 +OpenVRML library version 0.18.2 Copyright 1998, 1999, 2000 Chris Morley <cm...@ve...> Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Braden McDaniel <br...@en...> Modified: branches/0.18/configure.ac =================================================================== --- branches/0.18/configure.ac 2009-07-07 04:59:16 UTC (rev 3959) +++ branches/0.18/configure.ac 2009-07-07 05:37:45 UTC (rev 3960) @@ -1,4 +1,4 @@ -AC_INIT([OpenVRML], [0.18.1], [ope...@li...]) +AC_INIT([OpenVRML], [0.18.2], [ope...@li...]) AC_PREREQ([2.59]) AC_COPYRIGHT([Portions copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Braden McDaniel]) AC_CONFIG_MACRO_DIR([m4]) Modified: branches/0.18/doc/Doxyfile =================================================================== --- branches/0.18/doc/Doxyfile 2009-07-07 04:59:16 UTC (rev 3959) +++ branches/0.18/doc/Doxyfile 2009-07-07 05:37:45 UTC (rev 3960) @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = OpenVRML -PROJECT_NUMBER = 0.18.1 +PROJECT_NUMBER = 0.18.2 OUTPUT_DIRECTORY = CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English Modified: branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc =================================================================== --- branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc 2009-07-07 04:59:16 UTC (rev 3959) +++ branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc 2009-07-07 05:37:45 UTC (rev 3960) @@ -12,7 +12,7 @@ VS_VERSION_INFO VERSIONINFO FILEVERSION 9,1,0,0 - PRODUCTVERSION 0,18,1,0 + PRODUCTVERSION 0,18,2,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -33,7 +33,7 @@ VALUE "LegalCopyright", "Copyright (C) 2009" VALUE "OriginalFilename", "openvrml.dll" VALUE "ProductName", "OpenVRML Library" - VALUE "ProductVersion", "0.18.1" + VALUE "ProductVersion", "0.18.2" END END BLOCK "VarFileInfo" Modified: branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj =================================================================== --- branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj 2009-07-07 04:59:16 UTC (rev 3959) +++ branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj 2009-07-07 05:37:45 UTC (rev 3960) @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\src\node" - PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION=\"0.18.1\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\"\";OPENVRML_PKGLIBDIR_=\"\"" + PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION=\"0.18.2\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\"\";OPENVRML_PKGLIBDIR_=\"\"" MinimalRebuild="false" BasicRuntimeChecks="0" RuntimeLibrary="3" @@ -127,7 +127,7 @@ InlineFunctionExpansion="1" OmitFramePointers="true" AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\src\node" - PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;PACKAGE_VERSION=\"0.18.1\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\"\";OPENVRML_PKGLIBDIR_=\"\";NDEBUG" + PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;PACKAGE_VERSION=\"0.18.2\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\"\";OPENVRML_PKGLIBDIR_=\"\";NDEBUG" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" Modified: branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc =================================================================== --- branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc 2009-07-07 04:59:16 UTC (rev 3959) +++ branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc 2009-07-07 05:37:45 UTC (rev 3960) @@ -12,7 +12,7 @@ VS_VERSION_INFO VERSIONINFO FILEVERSION 8,0,0,0 - PRODUCTVERSION 0,18,1,0 + PRODUCTVERSION 0,18,2,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -33,7 +33,7 @@ VALUE "LegalCopyright", "Copyright (C) 2009" VALUE "OriginalFilename", "openvrml-gl.dll" VALUE "ProductName", "OpenVRML Library" - VALUE "ProductVersion", "0.18.1" + VALUE "ProductVersion", "0.18.2" END END BLOCK "VarFileInfo" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2009-07-12 06:16:26
|
Revision: 3966 http://openvrml.svn.sourceforge.net/openvrml/?rev=3966&view=rev Author: braden Date: 2009-07-12 06:16:21 +0000 (Sun, 12 Jul 2009) Log Message: ----------- Removed obsolete use of OPENVRML_RPATH. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/examples/Makefile.am Property Changed: ---------------- branches/0.18/ branches/0.18/src/libopenvrml/openvrml/bad_url.cpp branches/0.18/src/libopenvrml/openvrml/bad_url.h branches/0.18/src/libopenvrml/openvrml/local/proto.cpp branches/0.18/src/libopenvrml/openvrml/local/proto.h branches/0.18/src/libopenvrml/openvrml/scene.cpp branches/0.18/src/libopenvrml/openvrml/scene.h branches/0.18/src/libopenvrml/openvrml/script.cpp branches/0.18/src/mozilla-plugin/ branches/0.18/src/node/vrml97/register_node_metatypes.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.h branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp branches/0.18/src/node/x3d-core/metadata_double.cpp branches/0.18/src/node/x3d-core/metadata_double.h branches/0.18/src/node/x3d-core/metadata_float.cpp branches/0.18/src/node/x3d-core/metadata_float.h branches/0.18/src/node/x3d-core/metadata_integer.cpp branches/0.18/src/node/x3d-core/metadata_integer.h branches/0.18/src/node/x3d-core/metadata_set.cpp branches/0.18/src/node/x3d-core/metadata_set.h branches/0.18/src/node/x3d-core/metadata_string.cpp branches/0.18/src/node/x3d-core/metadata_string.h branches/0.18/src/node/x3d-core/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/espdu_transform.cpp branches/0.18/src/node/x3d-dis/espdu_transform.h branches/0.18/src/node/x3d-dis/receiver_pdu.cpp branches/0.18/src/node/x3d-dis/receiver_pdu.h branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/signal_pdu.cpp branches/0.18/src/node/x3d-dis/signal_pdu.h branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp branches/0.18/src/node/x3d-dis/transmitter_pdu.h branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.h branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp branches/0.18/src/node/x3d-event-utilities/boolean_filter.h branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp branches/0.18/src/node/x3d-event-utilities/integer_trigger.h branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.h branches/0.18/src/node/x3d-geometry2d/arc2d.cpp branches/0.18/src/node/x3d-geometry2d/arc2d.h branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp branches/0.18/src/node/x3d-geometry2d/arc_close2d.h branches/0.18/src/node/x3d-geometry2d/circle2d.cpp branches/0.18/src/node/x3d-geometry2d/circle2d.h branches/0.18/src/node/x3d-geometry2d/disk2d.cpp branches/0.18/src/node/x3d-geometry2d/disk2d.h branches/0.18/src/node/x3d-geometry2d/polyline2d.cpp branches/0.18/src/node/x3d-geometry2d/polyline2d.h branches/0.18/src/node/x3d-geometry2d/polypoint2d.cpp branches/0.18/src/node/x3d-geometry2d/polypoint2d.h branches/0.18/src/node/x3d-geometry2d/rectangle2d.cpp branches/0.18/src/node/x3d-geometry2d/rectangle2d.h branches/0.18/src/node/x3d-geometry2d/register_node_metatypes.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.h branches/0.18/src/node/x3d-geospatial/geo_coordinate.cpp branches/0.18/src/node/x3d-geospatial/geo_coordinate.h branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.cpp branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.h branches/0.18/src/node/x3d-geospatial/geo_location.cpp branches/0.18/src/node/x3d-geospatial/geo_location.h branches/0.18/src/node/x3d-geospatial/geo_lod.cpp branches/0.18/src/node/x3d-geospatial/geo_lod.h branches/0.18/src/node/x3d-geospatial/geo_metadata.cpp branches/0.18/src/node/x3d-geospatial/geo_metadata.h branches/0.18/src/node/x3d-geospatial/geo_origin.cpp branches/0.18/src/node/x3d-geospatial/geo_origin.h branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.cpp branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.h branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.cpp branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.h branches/0.18/src/node/x3d-geospatial/geo_viewpoint.cpp branches/0.18/src/node/x3d-geospatial/geo_viewpoint.h branches/0.18/src/node/x3d-geospatial/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/static_group.cpp branches/0.18/src/node/x3d-grouping/static_group.h branches/0.18/src/node/x3d-h-anim/h_anim_displacer.cpp branches/0.18/src/node/x3d-h-anim/h_anim_displacer.h branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.cpp branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.h branches/0.18/src/node/x3d-h-anim/h_anim_joint.cpp branches/0.18/src/node/x3d-h-anim/h_anim_joint.h branches/0.18/src/node/x3d-h-anim/h_anim_segment.cpp branches/0.18/src/node/x3d-h-anim/h_anim_segment.h branches/0.18/src/node/x3d-h-anim/h_anim_site.cpp branches/0.18/src/node/x3d-h-anim/h_anim_site.h branches/0.18/src/node/x3d-h-anim/register_node_metatypes.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.h branches/0.18/src/node/x3d-interpolation/position_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/position_interpolator2d.h branches/0.18/src/node/x3d-interpolation/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.h branches/0.18/src/node/x3d-key-device-sensor/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.h branches/0.18/src/node/x3d-networking/load_sensor.cpp branches/0.18/src/node/x3d-networking/load_sensor.h branches/0.18/src/node/x3d-networking/register_node_metatypes.cpp branches/0.18/src/node/x3d-nurbs/contour2d.cpp branches/0.18/src/node/x3d-nurbs/contour2d.h branches/0.18/src/node/x3d-nurbs/contour_polyline2d.cpp branches/0.18/src/node/x3d-nurbs/contour_polyline2d.h branches/0.18/src/node/x3d-nurbs/coordinate_double.cpp branches/0.18/src/node/x3d-nurbs/coordinate_double.h branches/0.18/src/node/x3d-nurbs/nurbs_curve.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve.h branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.h branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_set.cpp branches/0.18/src/node/x3d-nurbs/nurbs_set.h branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.h branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.h branches/0.18/src/node/x3d-nurbs/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/color_rgba.cpp branches/0.18/src/node/x3d-rendering/color_rgba.h branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.h branches/0.18/src/node/x3d-rendering/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.h branches/0.18/src/node/x3d-rendering/triangle_set.cpp branches/0.18/src/node/x3d-rendering/triangle_set.h branches/0.18/src/node/x3d-rendering/triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/triangle_strip_set.h branches/0.18/src/node/x3d-shape/fill_properties.cpp branches/0.18/src/node/x3d-shape/fill_properties.h branches/0.18/src/node/x3d-shape/line_properties.cpp branches/0.18/src/node/x3d-shape/line_properties.h branches/0.18/src/node/x3d-shape/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/multi_texture.cpp branches/0.18/src/node/x3d-texturing/multi_texture.h branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.cpp branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.h branches/0.18/src/node/x3d-texturing/multi_texture_transform.cpp branches/0.18/src/node/x3d-texturing/multi_texture_transform.h branches/0.18/src/node/x3d-texturing/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.h Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2009-07-12 06:10:24 UTC (rev 3965) +++ branches/0.18/ChangeLog 2009-07-12 06:16:21 UTC (rev 3966) @@ -1,3 +1,7 @@ +2009-07-12 Braden McDaniel <br...@en...> + + * examples/Makefile.am: Removed obsolete use of OPENVRML_RPATH. + 2009-07-07 Braden McDaniel <br...@en...> Updates for 0.18.2 release. Modified: branches/0.18/examples/Makefile.am =================================================================== --- branches/0.18/examples/Makefile.am 2009-07-12 06:10:24 UTC (rev 3965) +++ branches/0.18/examples/Makefile.am 2009-07-12 06:16:21 UTC (rev 3966) @@ -20,14 +20,13 @@ -I$(top_builddir)/src/libopenvrml-gl \ -I$(top_srcdir)/src/libopenvrml-gl sdl_viewer_CXXFLAGS = $(SDL_CFLAGS) -sdl_viewer_LDFLAGS = $(OPENVRML_RPATH) $(SDL_LIBS) $(JNI_LIBS) $(GLU_LIBS) +sdl_viewer_LDFLAGS = $(SDL_LIBS) $(JNI_LIBS) $(GLU_LIBS) sdl_viewer_LDADD = $(top_builddir)/src/libopenvrml-gl/libopenvrml-gl.la pretty_print_SOURCES = pretty_print.cpp pretty_print_CPPFLAGS = \ -I$(top_builddir)/src/libopenvrml \ -I$(top_srcdir)/src/libopenvrml -pretty_print_LDFLAGS = $(OPENVRML_RPATH) pretty_print_LDADD = $(top_builddir)/src/libopenvrml/libopenvrml.la EXTRA_DIST = $(sdl_viewer_SOURCES) $(pretty_print_SOURCES) Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958 + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965 Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958 + /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958 + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958 + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965 Property changes on: branches/0.18/src/libopenvrml/openvrml/script.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958 + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965 Property changes on: branches/0.18/src/mozilla-plugin ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/src/mozilla-plugin:3958 + /trunk/src/mozilla-plugin:3958,3965 Property changes on: branches/0.18/src/node/vrml97/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958 + /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965 Property changes on: branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958 + /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958 + /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958 + /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958 + /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958 + /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958 + /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958 + /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958 + /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958 + /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958 + /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958 + /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965 Property changes on: branches/0.18/src/node/x3d-core/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958 + /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958 + /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958 + /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958 + /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958 + /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965 Property changes on: branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958 + /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958 + /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.h:3958 + /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.h:3958,3965 Property changes on: branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.cpp:3958 + /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.cpp:3958,3965 Property changes on: branches/0.18/src/node/x3d-dis/transmitter_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.h:3958 + /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.h:3958,3965 Property changes on: branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 /trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3958 + /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 /trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3958,3965 Property changes on: branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.cpp:3958 + /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.cpp:3958,3965 Property changes on: branches/0.18/src/node/x3d-environmental-effects/texture_background.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.h:3958 + /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.h:3958,3965 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.cpp:3958 + /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.cpp:3958,3965 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_filter.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.h:3958 + /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.h:3958,3965 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp:3958 + /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp:3958,3965 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.h:3958 + /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.h:3958,3965 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.cpp:3958 + /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.cpp:3958,3965 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.h:3958 + /branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.h:3958,3965 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.cpp:3958 + /branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.cpp:3958,3965 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.h:3958 + /branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.h:3958,3965 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.cpp:3958 + /branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.cpp:3958,3965 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.h:3958 + /branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.h:3958,3965 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.cpp:3958 + /branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.cpp:3958,3965 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.h:3958 + /branches/local/src/node/x3d-event-utilities/integer_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.h:3958,3965 Property changes on: branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3734 /trunk/src/node/x3d-event-utilities/register_node_metatypes.cpp:3958 + /branches/0.17/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3734 /trunk/src/node/x3d-event-utilities/register_node_metatypes.cpp:3958,3965 Property changes on: branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/time_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/time_trigger.cpp:3958 + /branches/local/src/node/x3d-event-utilities/time_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/time_trigger.cpp:3958,3965 Property changes on: branches/0.18/src/node/x3d-event-utilities/time_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/time_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/time_trigger.h:3958 + /branches/local/src/node/x3d-event-utilities/time_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/time_trigger.h:3958,3965 Property changes on: branches/0.18/src/node/x3d-geometry2d/arc2d.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/arc2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc2d.cpp:3958 + /branches/local/src/node/x3d-geometry2d/arc2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc2d.cpp:3958,3965 Property changes on: branches/0.18/src/node/x3d-geometry2d/arc2d.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/arc2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc2d.h:3958 + /branches/local/src/node/x3d-geometry2d/arc2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc2d.h:3958,3965 Property changes on: branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/arc_close2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc_close2d.cpp:3958 + /branches/local/src/node/x3d-geometry2d/arc_close2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc_close2d.cpp:3958,3965 Property changes on: branches/0.18/src/node/x3d-geometry2d/arc_close2d.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/arc_close2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc_close2d.h:3958 + /branches/local/src/node/x3d-geometry2d/arc_close2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc_close2d.h:3958,3965 Property changes on: branches/0.18/src/node/x3d-geometry2d/circle2d.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/circle2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/circle2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/circle2d.cpp:3958 + /branches/local/src/node/x3d-geometry2d/circle2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/circle2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/circle2d.cpp:3958,3965 Property changes on: branches/0.18/src/node/x3d-geometry2d/circle2d.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/circle2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/circle2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/circle2d.h:3958 + /branches/local/src/node/x3d-geometry2d/circle2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/circle2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/circle2d.h:3958,3965 Property changes on: branches/0.18/src/node/x3d-geometry2d/disk2d.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/disk2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/disk2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/disk2d.cpp:3958 + /branches/local/src/node/x3d-geometry2d/disk2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/disk2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/disk2d.cpp:3958,3965 Property changes on: branches/0.18/src/node/x3d-geometry2d/disk2d.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/disk2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/disk2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /tru... [truncated message content] |
From: <br...@us...> - 2009-07-12 06:31:34
|
Revision: 3968 http://openvrml.svn.sourceforge.net/openvrml/?rev=3968&view=rev Author: braden Date: 2009-07-12 06:31:31 +0000 (Sun, 12 Jul 2009) Log Message: ----------- Removed obsolete use of OPENVRML_RPATH. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/tests/Makefile.am Property Changed: ---------------- branches/0.18/ branches/0.18/src/libopenvrml/openvrml/bad_url.cpp branches/0.18/src/libopenvrml/openvrml/bad_url.h branches/0.18/src/libopenvrml/openvrml/local/proto.cpp branches/0.18/src/libopenvrml/openvrml/local/proto.h branches/0.18/src/libopenvrml/openvrml/scene.cpp branches/0.18/src/libopenvrml/openvrml/scene.h branches/0.18/src/libopenvrml/openvrml/script.cpp branches/0.18/src/mozilla-plugin/ branches/0.18/src/node/vrml97/register_node_metatypes.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.h branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp branches/0.18/src/node/x3d-core/metadata_double.cpp branches/0.18/src/node/x3d-core/metadata_double.h branches/0.18/src/node/x3d-core/metadata_float.cpp branches/0.18/src/node/x3d-core/metadata_float.h branches/0.18/src/node/x3d-core/metadata_integer.cpp branches/0.18/src/node/x3d-core/metadata_integer.h branches/0.18/src/node/x3d-core/metadata_set.cpp branches/0.18/src/node/x3d-core/metadata_set.h branches/0.18/src/node/x3d-core/metadata_string.cpp branches/0.18/src/node/x3d-core/metadata_string.h branches/0.18/src/node/x3d-core/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/espdu_transform.cpp branches/0.18/src/node/x3d-dis/espdu_transform.h branches/0.18/src/node/x3d-dis/receiver_pdu.cpp branches/0.18/src/node/x3d-dis/receiver_pdu.h branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/signal_pdu.cpp branches/0.18/src/node/x3d-dis/signal_pdu.h branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp branches/0.18/src/node/x3d-dis/transmitter_pdu.h branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.h branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp branches/0.18/src/node/x3d-event-utilities/boolean_filter.h branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp branches/0.18/src/node/x3d-event-utilities/integer_trigger.h branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.h branches/0.18/src/node/x3d-geometry2d/arc2d.cpp branches/0.18/src/node/x3d-geometry2d/arc2d.h branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp branches/0.18/src/node/x3d-geometry2d/arc_close2d.h branches/0.18/src/node/x3d-geometry2d/circle2d.cpp branches/0.18/src/node/x3d-geometry2d/circle2d.h branches/0.18/src/node/x3d-geometry2d/disk2d.cpp branches/0.18/src/node/x3d-geometry2d/disk2d.h branches/0.18/src/node/x3d-geometry2d/polyline2d.cpp branches/0.18/src/node/x3d-geometry2d/polyline2d.h branches/0.18/src/node/x3d-geometry2d/polypoint2d.cpp branches/0.18/src/node/x3d-geometry2d/polypoint2d.h branches/0.18/src/node/x3d-geometry2d/rectangle2d.cpp branches/0.18/src/node/x3d-geometry2d/rectangle2d.h branches/0.18/src/node/x3d-geometry2d/register_node_metatypes.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.h branches/0.18/src/node/x3d-geospatial/geo_coordinate.cpp branches/0.18/src/node/x3d-geospatial/geo_coordinate.h branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.cpp branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.h branches/0.18/src/node/x3d-geospatial/geo_location.cpp branches/0.18/src/node/x3d-geospatial/geo_location.h branches/0.18/src/node/x3d-geospatial/geo_lod.cpp branches/0.18/src/node/x3d-geospatial/geo_lod.h branches/0.18/src/node/x3d-geospatial/geo_metadata.cpp branches/0.18/src/node/x3d-geospatial/geo_metadata.h branches/0.18/src/node/x3d-geospatial/geo_origin.cpp branches/0.18/src/node/x3d-geospatial/geo_origin.h branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.cpp branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.h branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.cpp branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.h branches/0.18/src/node/x3d-geospatial/geo_viewpoint.cpp branches/0.18/src/node/x3d-geospatial/geo_viewpoint.h branches/0.18/src/node/x3d-geospatial/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/static_group.cpp branches/0.18/src/node/x3d-grouping/static_group.h branches/0.18/src/node/x3d-h-anim/h_anim_displacer.cpp branches/0.18/src/node/x3d-h-anim/h_anim_displacer.h branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.cpp branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.h branches/0.18/src/node/x3d-h-anim/h_anim_joint.cpp branches/0.18/src/node/x3d-h-anim/h_anim_joint.h branches/0.18/src/node/x3d-h-anim/h_anim_segment.cpp branches/0.18/src/node/x3d-h-anim/h_anim_segment.h branches/0.18/src/node/x3d-h-anim/h_anim_site.cpp branches/0.18/src/node/x3d-h-anim/h_anim_site.h branches/0.18/src/node/x3d-h-anim/register_node_metatypes.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.h branches/0.18/src/node/x3d-interpolation/position_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/position_interpolator2d.h branches/0.18/src/node/x3d-interpolation/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.h branches/0.18/src/node/x3d-key-device-sensor/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.h branches/0.18/src/node/x3d-networking/load_sensor.cpp branches/0.18/src/node/x3d-networking/load_sensor.h branches/0.18/src/node/x3d-networking/register_node_metatypes.cpp branches/0.18/src/node/x3d-nurbs/contour2d.cpp branches/0.18/src/node/x3d-nurbs/contour2d.h branches/0.18/src/node/x3d-nurbs/contour_polyline2d.cpp branches/0.18/src/node/x3d-nurbs/contour_polyline2d.h branches/0.18/src/node/x3d-nurbs/coordinate_double.cpp branches/0.18/src/node/x3d-nurbs/coordinate_double.h branches/0.18/src/node/x3d-nurbs/nurbs_curve.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve.h branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.h branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_set.cpp branches/0.18/src/node/x3d-nurbs/nurbs_set.h branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.h branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.h branches/0.18/src/node/x3d-nurbs/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/color_rgba.cpp branches/0.18/src/node/x3d-rendering/color_rgba.h branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.h branches/0.18/src/node/x3d-rendering/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.h branches/0.18/src/node/x3d-rendering/triangle_set.cpp branches/0.18/src/node/x3d-rendering/triangle_set.h branches/0.18/src/node/x3d-rendering/triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/triangle_strip_set.h branches/0.18/src/node/x3d-shape/fill_properties.cpp branches/0.18/src/node/x3d-shape/fill_properties.h branches/0.18/src/node/x3d-shape/line_properties.cpp branches/0.18/src/node/x3d-shape/line_properties.h branches/0.18/src/node/x3d-shape/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/multi_texture.cpp branches/0.18/src/node/x3d-texturing/multi_texture.h branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.cpp branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.h branches/0.18/src/node/x3d-texturing/multi_texture_transform.cpp branches/0.18/src/node/x3d-texturing/multi_texture_transform.h branches/0.18/src/node/x3d-texturing/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.h Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2009-07-12 06:24:08 UTC (rev 3967) +++ branches/0.18/ChangeLog 2009-07-12 06:31:31 UTC (rev 3968) @@ -1,5 +1,9 @@ 2009-07-12 Braden McDaniel <br...@en...> + * tests/Makefile.am: Removed obsolete use of OPENVRML_RPATH. + +2009-07-12 Braden McDaniel <br...@en...> + * examples/Makefile.am: Removed obsolete use of OPENVRML_RPATH. 2009-07-07 Braden McDaniel <br...@en...> Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965 + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967 Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965 + /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965 + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965 + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967 Property changes on: branches/0.18/src/libopenvrml/openvrml/script.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965 + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967 Property changes on: branches/0.18/src/mozilla-plugin ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/src/mozilla-plugin:3958,3965 + /trunk/src/mozilla-plugin:3958,3965,3967 Property changes on: branches/0.18/src/node/vrml97/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965 + /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965 + /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965 + /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965 + /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965 + /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965 + /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965 + /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965 + /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965 + /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965 + /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965 + /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965 + /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-core/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965 + /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965 + /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965 + /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965 + /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965 + /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965 + /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965 + /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.h:3958,3965 + /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.h:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.cpp:3958,3965 + /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.cpp:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-dis/transmitter_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.h:3958,3965 + /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.h:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 /trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3958,3965 + /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 /trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.cpp:3958,3965 + /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.cpp:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-environmental-effects/texture_background.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.h:3958,3965 + /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.h:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.cpp:3958,3965 + /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.cpp:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_filter.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.h:3958,3965 + /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.h:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp:3958,3965 + /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.h:3958,3965 + /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.h:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.cpp:3958,3965 + /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.cpp:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.h:3958,3965 + /branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.h:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.cpp:3958,3965 + /branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.cpp:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.h:3958,3965 + /branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.h:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.cpp:3958,3965 + /branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.cpp:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.h:3958,3965 + /branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.h:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.cpp:3958,3965 + /branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.cpp:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.h:3958,3965 + /branches/local/src/node/x3d-event-utilities/integer_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.h:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3734 /trunk/src/node/x3d-event-utilities/register_node_metatypes.cpp:3958,3965 + /branches/0.17/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3734 /trunk/src/node/x3d-event-utilities/register_node_metatypes.cpp:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/time_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/time_trigger.cpp:3958,3965 + /branches/local/src/node/x3d-event-utilities/time_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/time_trigger.cpp:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-event-utilities/time_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/time_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/time_trigger.h:3958,3965 + /branches/local/src/node/x3d-event-utilities/time_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/time_trigger.h:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-geometry2d/arc2d.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/arc2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc2d.cpp:3958,3965 + /branches/local/src/node/x3d-geometry2d/arc2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc2d.cpp:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-geometry2d/arc2d.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/arc2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc2d.h:3958,3965 + /branches/local/src/node/x3d-geometry2d/arc2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc2d.h:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/arc_close2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc_close2d.cpp:3958,3965 + /branches/local/src/node/x3d-geometry2d/arc_close2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc_close2d.cpp:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-geometry2d/arc_close2d.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/arc_close2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc_close2d.h:3958,3965 + /branches/local/src/node/x3d-geometry2d/arc_close2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc_close2d.h:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-geometry2d/circle2d.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/circle2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/circle2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/circle2d.cpp:3958,3965 + /branches/local/src/node/x3d-geometry2d/circle2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/circle2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/circle2d.cpp:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-geometry2d/circle2d.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/circle2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/circle2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/circle2d.h:3958,3965 + /branches/local/src/node/x3d-geometry2d/circle2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/circle2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/circle2d.h:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-geometry2d/disk2d.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/disk2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/disk2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/disk2d.cpp:3958,3965 + /branches/local/src/node/x3d-geometry2d/disk2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/disk2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/disk2d.cpp:3958,3965,3967 Property changes on: branches/0.18/src/node/x3d-geometry2d/disk2d.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/disk2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/disk2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/disk2d.h:3958,3965 + /branches/local/src/node/x3d-geometry2d/disk2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/disk2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-36... [truncated message content] |
From: <br...@us...> - 2009-07-12 06:41:07
|
Revision: 3970 http://openvrml.svn.sourceforge.net/openvrml/?rev=3970&view=rev Author: braden Date: 2009-07-12 06:41:03 +0000 (Sun, 12 Jul 2009) Log Message: ----------- Remove obsolete configuration code supporting linking with libjvm. (We don't do that anymore.) Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/examples/Makefile.am branches/0.18/m4/jdk.m4 Property Changed: ---------------- branches/0.18/ branches/0.18/src/libopenvrml/openvrml/bad_url.cpp branches/0.18/src/libopenvrml/openvrml/bad_url.h branches/0.18/src/libopenvrml/openvrml/local/proto.cpp branches/0.18/src/libopenvrml/openvrml/local/proto.h branches/0.18/src/libopenvrml/openvrml/scene.cpp branches/0.18/src/libopenvrml/openvrml/scene.h branches/0.18/src/libopenvrml/openvrml/script.cpp branches/0.18/src/mozilla-plugin/ branches/0.18/src/node/vrml97/register_node_metatypes.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.h branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp branches/0.18/src/node/x3d-core/metadata_double.cpp branches/0.18/src/node/x3d-core/metadata_double.h branches/0.18/src/node/x3d-core/metadata_float.cpp branches/0.18/src/node/x3d-core/metadata_float.h branches/0.18/src/node/x3d-core/metadata_integer.cpp branches/0.18/src/node/x3d-core/metadata_integer.h branches/0.18/src/node/x3d-core/metadata_set.cpp branches/0.18/src/node/x3d-core/metadata_set.h branches/0.18/src/node/x3d-core/metadata_string.cpp branches/0.18/src/node/x3d-core/metadata_string.h branches/0.18/src/node/x3d-core/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/espdu_transform.cpp branches/0.18/src/node/x3d-dis/espdu_transform.h branches/0.18/src/node/x3d-dis/receiver_pdu.cpp branches/0.18/src/node/x3d-dis/receiver_pdu.h branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/signal_pdu.cpp branches/0.18/src/node/x3d-dis/signal_pdu.h branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp branches/0.18/src/node/x3d-dis/transmitter_pdu.h branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.h branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp branches/0.18/src/node/x3d-event-utilities/boolean_filter.h branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp branches/0.18/src/node/x3d-event-utilities/integer_trigger.h branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.h branches/0.18/src/node/x3d-geometry2d/arc2d.cpp branches/0.18/src/node/x3d-geometry2d/arc2d.h branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp branches/0.18/src/node/x3d-geometry2d/arc_close2d.h branches/0.18/src/node/x3d-geometry2d/circle2d.cpp branches/0.18/src/node/x3d-geometry2d/circle2d.h branches/0.18/src/node/x3d-geometry2d/disk2d.cpp branches/0.18/src/node/x3d-geometry2d/disk2d.h branches/0.18/src/node/x3d-geometry2d/polyline2d.cpp branches/0.18/src/node/x3d-geometry2d/polyline2d.h branches/0.18/src/node/x3d-geometry2d/polypoint2d.cpp branches/0.18/src/node/x3d-geometry2d/polypoint2d.h branches/0.18/src/node/x3d-geometry2d/rectangle2d.cpp branches/0.18/src/node/x3d-geometry2d/rectangle2d.h branches/0.18/src/node/x3d-geometry2d/register_node_metatypes.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.h branches/0.18/src/node/x3d-geospatial/geo_coordinate.cpp branches/0.18/src/node/x3d-geospatial/geo_coordinate.h branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.cpp branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.h branches/0.18/src/node/x3d-geospatial/geo_location.cpp branches/0.18/src/node/x3d-geospatial/geo_location.h branches/0.18/src/node/x3d-geospatial/geo_lod.cpp branches/0.18/src/node/x3d-geospatial/geo_lod.h branches/0.18/src/node/x3d-geospatial/geo_metadata.cpp branches/0.18/src/node/x3d-geospatial/geo_metadata.h branches/0.18/src/node/x3d-geospatial/geo_origin.cpp branches/0.18/src/node/x3d-geospatial/geo_origin.h branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.cpp branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.h branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.cpp branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.h branches/0.18/src/node/x3d-geospatial/geo_viewpoint.cpp branches/0.18/src/node/x3d-geospatial/geo_viewpoint.h branches/0.18/src/node/x3d-geospatial/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/static_group.cpp branches/0.18/src/node/x3d-grouping/static_group.h branches/0.18/src/node/x3d-h-anim/h_anim_displacer.cpp branches/0.18/src/node/x3d-h-anim/h_anim_displacer.h branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.cpp branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.h branches/0.18/src/node/x3d-h-anim/h_anim_joint.cpp branches/0.18/src/node/x3d-h-anim/h_anim_joint.h branches/0.18/src/node/x3d-h-anim/h_anim_segment.cpp branches/0.18/src/node/x3d-h-anim/h_anim_segment.h branches/0.18/src/node/x3d-h-anim/h_anim_site.cpp branches/0.18/src/node/x3d-h-anim/h_anim_site.h branches/0.18/src/node/x3d-h-anim/register_node_metatypes.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.h branches/0.18/src/node/x3d-interpolation/position_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/position_interpolator2d.h branches/0.18/src/node/x3d-interpolation/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.h branches/0.18/src/node/x3d-key-device-sensor/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.h branches/0.18/src/node/x3d-networking/load_sensor.cpp branches/0.18/src/node/x3d-networking/load_sensor.h branches/0.18/src/node/x3d-networking/register_node_metatypes.cpp branches/0.18/src/node/x3d-nurbs/contour2d.cpp branches/0.18/src/node/x3d-nurbs/contour2d.h branches/0.18/src/node/x3d-nurbs/contour_polyline2d.cpp branches/0.18/src/node/x3d-nurbs/contour_polyline2d.h branches/0.18/src/node/x3d-nurbs/coordinate_double.cpp branches/0.18/src/node/x3d-nurbs/coordinate_double.h branches/0.18/src/node/x3d-nurbs/nurbs_curve.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve.h branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.h branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_set.cpp branches/0.18/src/node/x3d-nurbs/nurbs_set.h branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.h branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.h branches/0.18/src/node/x3d-nurbs/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/color_rgba.cpp branches/0.18/src/node/x3d-rendering/color_rgba.h branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.h branches/0.18/src/node/x3d-rendering/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.h branches/0.18/src/node/x3d-rendering/triangle_set.cpp branches/0.18/src/node/x3d-rendering/triangle_set.h branches/0.18/src/node/x3d-rendering/triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/triangle_strip_set.h branches/0.18/src/node/x3d-shape/fill_properties.cpp branches/0.18/src/node/x3d-shape/fill_properties.h branches/0.18/src/node/x3d-shape/line_properties.cpp branches/0.18/src/node/x3d-shape/line_properties.h branches/0.18/src/node/x3d-shape/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/multi_texture.cpp branches/0.18/src/node/x3d-texturing/multi_texture.h branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.cpp branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.h branches/0.18/src/node/x3d-texturing/multi_texture_transform.cpp branches/0.18/src/node/x3d-texturing/multi_texture_transform.h branches/0.18/src/node/x3d-texturing/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.h Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2009-07-12 06:37:50 UTC (rev 3969) +++ branches/0.18/ChangeLog 2009-07-12 06:41:03 UTC (rev 3970) @@ -1,5 +1,13 @@ 2009-07-12 Braden McDaniel <br...@en...> + Remove obsolete configuration code supporting linking with + libjvm. (We don't do that anymore.) + + * examples/Makefile.am: Removed obsolete use of JNI_LIBS. + * m4/jdk.m4: Removed unused OV_CHECK_JNI macro. + +2009-07-12 Braden McDaniel <br...@en...> + * tests/Makefile.am: Removed obsolete use of OPENVRML_RPATH. 2009-07-12 Braden McDaniel <br...@en...> Modified: branches/0.18/examples/Makefile.am =================================================================== --- branches/0.18/examples/Makefile.am 2009-07-12 06:37:50 UTC (rev 3969) +++ branches/0.18/examples/Makefile.am 2009-07-12 06:41:03 UTC (rev 3970) @@ -20,7 +20,7 @@ -I$(top_builddir)/src/libopenvrml-gl \ -I$(top_srcdir)/src/libopenvrml-gl sdl_viewer_CXXFLAGS = $(SDL_CFLAGS) -sdl_viewer_LDFLAGS = $(SDL_LIBS) $(JNI_LIBS) $(GLU_LIBS) +sdl_viewer_LDFLAGS = $(SDL_LIBS) $(GLU_LIBS) sdl_viewer_LDADD = $(top_builddir)/src/libopenvrml-gl/libopenvrml-gl.la pretty_print_SOURCES = pretty_print.cpp Modified: branches/0.18/m4/jdk.m4 =================================================================== --- branches/0.18/m4/jdk.m4 2009-07-12 06:37:50 UTC (rev 3969) +++ branches/0.18/m4/jdk.m4 2009-07-12 06:41:03 UTC (rev 3970) @@ -15,38 +15,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# OV_CHECK_JNI -# ------------ -# Check for a Java Native Interface implementation. If one is found, the -# required linker flags are included in the output variable "JNI_LIBS"; -# otherwise, the shell variable "no_jni" is set to "yes". -# -AC_DEFUN([OV_CHECK_JNI], -[AC_MSG_CHECKING([for JNI library]) -AC_CACHE_VAL([ov_cv_check_jni_libjvm], -[ov_cv_check_jni_libjvm=no -AC_LANG_PUSH(C) -ov_save_LIBS="${LIBS}" -LIBS="" -ov_check_libs="-ljvm -lgcj" -for ov_lib in ${ov_check_libs}; do - LIBS="${ov_lib} ${ov_save_libs}" - AC_TRY_LINK([#include <jni.h>], [JNI_CreateJavaVM(0, 0, 0)], - [ov_cv_check_jni_libjvm=${ov_lib}; break]) -done -LIBS="${ov_save_LIBS}" -AC_LANG_POP(C)]) -AC_MSG_RESULT([$ov_cv_check_jni_libjvm]) -if test "X${ov_cv_check_jni_libjvm}" = "Xno"; then - no_jni=yes -else - JNI_LIBS="${ov_cv_check_jni_libjvm}" -fi -AC_SUBST([JNI_LIBS]) -]) - - AC_DEFUN([OV_PROG_JAVA], [AC_ARG_VAR([JAVA], [Java interpreter command])dnl AC_ARG_VAR([JAVAFLAGS], [Java interpreter flags])dnl Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967 + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969 Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967 + /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967 + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967 + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969 Property changes on: branches/0.18/src/libopenvrml/openvrml/script.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967 + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969 Property changes on: branches/0.18/src/mozilla-plugin ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/src/mozilla-plugin:3958,3965,3967 + /trunk/src/mozilla-plugin:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/vrml97/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967 + /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967 + /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967 + /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967 + /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967 + /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967 + /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967 + /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967 + /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967 + /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967 + /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967 + /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967 + /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-core/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967 + /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967 + /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967 + /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967 + /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967 + /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967 + /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967 + /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.h:3958,3965,3967 + /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.h:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.cpp:3958,3965,3967 + /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.cpp:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-dis/transmitter_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.h:3958,3965,3967 + /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.h:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 /trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3958,3965,3967 + /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 /trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.cpp:3958,3965,3967 + /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.cpp:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-environmental-effects/texture_background.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.h:3958,3965,3967 + /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.h:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.cpp:3958,3965,3967 + /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.cpp:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_filter.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.h:3958,3965,3967 + /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.h:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp:3958,3965,3967 + /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.h:3958,3965,3967 + /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.h:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.cpp:3958,3965,3967 + /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.cpp:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.h:3958,3965,3967 + /branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.h:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.cpp:3958,3965,3967 + /branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.cpp:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.h:3958,3965,3967 + /branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.h:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.cpp:3958,3965,3967 + /branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.cpp:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.h:3958,3965,3967 + /branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.h:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.cpp:3958,3965,3967 + /branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.cpp:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.h:3958,3965,3967 + /branches/local/src/node/x3d-event-utilities/integer_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.h:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3734 /trunk/src/node/x3d-event-utilities/register_node_metatypes.cpp:3958,3965,3967 + /branches/0.17/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3734 /trunk/src/node/x3d-event-utilities/register_node_metatypes.cpp:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/time_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/time_trigger.cpp:3958,3965,3967 + /branches/local/src/node/x3d-event-utilities/time_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/time_trigger.cpp:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-event-utilities/time_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/time_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/time_trigger.h:3958,3965,3967 + /branches/local/src/node/x3d-event-utilities/time_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/time_trigger.h:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-geometry2d/arc2d.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/arc2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc2d.cpp:3958,3965,3967 + /branches/local/src/node/x3d-geometry2d/arc2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc2d.cpp:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-geometry2d/arc2d.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/arc2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc2d.h:3958,3965,3967 + /branches/local/src/node/x3d-geometry2d/arc2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc2d.h:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/arc_close2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc_close2d.cpp:3958,3965,3967 + /branches/local/src/node/x3d-geometry2d/arc_close2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc_close2d.cpp:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-geometry2d/arc_close2d.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/arc_close2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc_close2d.h:3958,3965,3967 + /branches/local/src/node/x3d-geometry2d/arc_close2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc_close2d.h:3958,3965,3967,3969 Property changes on: branches/0.18/src/node/x3d-geometry2d/circle2d.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/circle2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/circle2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3... [truncated message content] |
From: <br...@us...> - 2009-07-13 08:51:46
|
Revision: 3972 http://openvrml.svn.sourceforge.net/openvrml/?rev=3972&view=rev Author: braden Date: 2009-07-13 08:51:42 +0000 (Mon, 13 Jul 2009) Log Message: ----------- Apply OPENVRML_API to *_get_type functions for GTK+ widgets. GtkBuilder needs to see these symbols when reading UI XML. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/src/openvrml-player/curlbrowserhost.h branches/0.18/src/openvrml-player/filechooserdialog.h Property Changed: ---------------- branches/0.18/ branches/0.18/src/libopenvrml/openvrml/bad_url.cpp branches/0.18/src/libopenvrml/openvrml/bad_url.h branches/0.18/src/libopenvrml/openvrml/local/proto.cpp branches/0.18/src/libopenvrml/openvrml/local/proto.h branches/0.18/src/libopenvrml/openvrml/scene.cpp branches/0.18/src/libopenvrml/openvrml/scene.h branches/0.18/src/libopenvrml/openvrml/script.cpp branches/0.18/src/mozilla-plugin/ branches/0.18/src/node/vrml97/register_node_metatypes.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.h branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp branches/0.18/src/node/x3d-core/metadata_double.cpp branches/0.18/src/node/x3d-core/metadata_double.h branches/0.18/src/node/x3d-core/metadata_float.cpp branches/0.18/src/node/x3d-core/metadata_float.h branches/0.18/src/node/x3d-core/metadata_integer.cpp branches/0.18/src/node/x3d-core/metadata_integer.h branches/0.18/src/node/x3d-core/metadata_set.cpp branches/0.18/src/node/x3d-core/metadata_set.h branches/0.18/src/node/x3d-core/metadata_string.cpp branches/0.18/src/node/x3d-core/metadata_string.h branches/0.18/src/node/x3d-core/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/espdu_transform.cpp branches/0.18/src/node/x3d-dis/espdu_transform.h branches/0.18/src/node/x3d-dis/receiver_pdu.cpp branches/0.18/src/node/x3d-dis/receiver_pdu.h branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/signal_pdu.cpp branches/0.18/src/node/x3d-dis/signal_pdu.h branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp branches/0.18/src/node/x3d-dis/transmitter_pdu.h branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.h branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp branches/0.18/src/node/x3d-event-utilities/boolean_filter.h branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp branches/0.18/src/node/x3d-event-utilities/integer_trigger.h branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.h branches/0.18/src/node/x3d-geometry2d/arc2d.cpp branches/0.18/src/node/x3d-geometry2d/arc2d.h branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp branches/0.18/src/node/x3d-geometry2d/arc_close2d.h branches/0.18/src/node/x3d-geometry2d/circle2d.cpp branches/0.18/src/node/x3d-geometry2d/circle2d.h branches/0.18/src/node/x3d-geometry2d/disk2d.cpp branches/0.18/src/node/x3d-geometry2d/disk2d.h branches/0.18/src/node/x3d-geometry2d/polyline2d.cpp branches/0.18/src/node/x3d-geometry2d/polyline2d.h branches/0.18/src/node/x3d-geometry2d/polypoint2d.cpp branches/0.18/src/node/x3d-geometry2d/polypoint2d.h branches/0.18/src/node/x3d-geometry2d/rectangle2d.cpp branches/0.18/src/node/x3d-geometry2d/rectangle2d.h branches/0.18/src/node/x3d-geometry2d/register_node_metatypes.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.h branches/0.18/src/node/x3d-geospatial/geo_coordinate.cpp branches/0.18/src/node/x3d-geospatial/geo_coordinate.h branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.cpp branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.h branches/0.18/src/node/x3d-geospatial/geo_location.cpp branches/0.18/src/node/x3d-geospatial/geo_location.h branches/0.18/src/node/x3d-geospatial/geo_lod.cpp branches/0.18/src/node/x3d-geospatial/geo_lod.h branches/0.18/src/node/x3d-geospatial/geo_metadata.cpp branches/0.18/src/node/x3d-geospatial/geo_metadata.h branches/0.18/src/node/x3d-geospatial/geo_origin.cpp branches/0.18/src/node/x3d-geospatial/geo_origin.h branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.cpp branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.h branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.cpp branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.h branches/0.18/src/node/x3d-geospatial/geo_viewpoint.cpp branches/0.18/src/node/x3d-geospatial/geo_viewpoint.h branches/0.18/src/node/x3d-geospatial/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/static_group.cpp branches/0.18/src/node/x3d-grouping/static_group.h branches/0.18/src/node/x3d-h-anim/h_anim_displacer.cpp branches/0.18/src/node/x3d-h-anim/h_anim_displacer.h branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.cpp branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.h branches/0.18/src/node/x3d-h-anim/h_anim_joint.cpp branches/0.18/src/node/x3d-h-anim/h_anim_joint.h branches/0.18/src/node/x3d-h-anim/h_anim_segment.cpp branches/0.18/src/node/x3d-h-anim/h_anim_segment.h branches/0.18/src/node/x3d-h-anim/h_anim_site.cpp branches/0.18/src/node/x3d-h-anim/h_anim_site.h branches/0.18/src/node/x3d-h-anim/register_node_metatypes.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.h branches/0.18/src/node/x3d-interpolation/position_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/position_interpolator2d.h branches/0.18/src/node/x3d-interpolation/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.h branches/0.18/src/node/x3d-key-device-sensor/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.h branches/0.18/src/node/x3d-networking/load_sensor.cpp branches/0.18/src/node/x3d-networking/load_sensor.h branches/0.18/src/node/x3d-networking/register_node_metatypes.cpp branches/0.18/src/node/x3d-nurbs/contour2d.cpp branches/0.18/src/node/x3d-nurbs/contour2d.h branches/0.18/src/node/x3d-nurbs/contour_polyline2d.cpp branches/0.18/src/node/x3d-nurbs/contour_polyline2d.h branches/0.18/src/node/x3d-nurbs/coordinate_double.cpp branches/0.18/src/node/x3d-nurbs/coordinate_double.h branches/0.18/src/node/x3d-nurbs/nurbs_curve.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve.h branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.h branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_set.cpp branches/0.18/src/node/x3d-nurbs/nurbs_set.h branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.h branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.h branches/0.18/src/node/x3d-nurbs/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/color_rgba.cpp branches/0.18/src/node/x3d-rendering/color_rgba.h branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.h branches/0.18/src/node/x3d-rendering/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.h branches/0.18/src/node/x3d-rendering/triangle_set.cpp branches/0.18/src/node/x3d-rendering/triangle_set.h branches/0.18/src/node/x3d-rendering/triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/triangle_strip_set.h branches/0.18/src/node/x3d-shape/fill_properties.cpp branches/0.18/src/node/x3d-shape/fill_properties.h branches/0.18/src/node/x3d-shape/line_properties.cpp branches/0.18/src/node/x3d-shape/line_properties.h branches/0.18/src/node/x3d-shape/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/multi_texture.cpp branches/0.18/src/node/x3d-texturing/multi_texture.h branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.cpp branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.h branches/0.18/src/node/x3d-texturing/multi_texture_transform.cpp branches/0.18/src/node/x3d-texturing/multi_texture_transform.h branches/0.18/src/node/x3d-texturing/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.h Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2009-07-13 08:40:34 UTC (rev 3971) +++ branches/0.18/ChangeLog 2009-07-13 08:51:42 UTC (rev 3972) @@ -1,3 +1,11 @@ +2009-07-13 Braden McDaniel <br...@en...> + + Apply OPENVRML_API to *_get_type functions for GTK+ widgets. + GtkBuilder needs to see these symbols when reading UI XML. + + * src/openvrml-player/filechooserdialog.h + * src/openvrml-player/curlbrowserhost.h + 2009-07-12 Braden McDaniel <br...@en...> Remove obsolete configuration code supporting linking with Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969 + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969 + /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969 + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969 + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/libopenvrml/openvrml/script.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969 + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/mozilla-plugin ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/src/mozilla-plugin:3958,3965,3967,3969 + /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/vrml97/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969 + /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969 + /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969 + /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969 + /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969 + /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969 + /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969 + /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969 + /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969 + /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969 + /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969 + /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969 + /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-core/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969 + /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969 + /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969 + /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969 + /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969 + /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969 + /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967,3969 + /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.h:3958,3965,3967,3969 + /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.h:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.cpp:3958,3965,3967,3969 + /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.cpp:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-dis/transmitter_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.h:3958,3965,3967,3969 + /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.h:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 /trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3958,3965,3967,3969 + /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 /trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.cpp:3958,3965,3967,3969 + /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.cpp:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-environmental-effects/texture_background.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.h:3958,3965,3967,3969 + /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.h:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.cpp:3958,3965,3967,3969 + /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.cpp:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_filter.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.h:3958,3965,3967,3969 + /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.h:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp:3958,3965,3967,3969 + /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.h:3958,3965,3967,3969 + /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.h:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.cpp:3958,3965,3967,3969 + /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.cpp:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.h:3958,3965,3967,3969 + /branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.h:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.cpp:3958,3965,3967,3969 + /branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.cpp:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.h:3958,3965,3967,3969 + /branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.h:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.cpp:3958,3965,3967,3969 + /branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.cpp:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.h:3958,3965,3967,3969 + /branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.h:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.cpp:3958,3965,3967,3969 + /branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.cpp:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.h:3958,3965,3967,3969 + /branches/local/src/node/x3d-event-utilities/integer_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.h:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3734 /trunk/src/node/x3d-event-utilities/register_node_metatypes.cpp:3958,3965,3967,3969 + /branches/0.17/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3734 /trunk/src/node/x3d-event-utilities/register_node_metatypes.cpp:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/time_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/time_trigger.cpp:3958,3965,3967,3969 + /branches/local/src/node/x3d-event-utilities/time_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/time_trigger.cpp:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-event-utilities/time_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/time_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/time_trigger.h:3958,3965,3967,3969 + /branches/local/src/node/x3d-event-utilities/time_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/time_trigger.h:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-geometry2d/arc2d.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/arc2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc2d.cpp:3958,3965,3967,3969 + /branches/local/src/node/x3d-geometry2d/arc2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc2d.cpp:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-geometry2d/arc2d.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/arc2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc2d.h:3958,3965,3967,3969 + /branches/local/src/node/x3d-geometry2d/arc2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc2d.h:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/arc_close2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc_close2d.cpp:3958,3965,3967,3969 + /branches/local/src/node/x3d-geometry2d/arc_close2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc_close2d.cpp:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-geometry2d/arc_close2d.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/arc_close2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc_close2d.h:3958,3965,3967,3969 + /branches/local/src/node/x3d-geometry2d/arc_close2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc_close2d.h:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-geometry2d/circle2d.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/circle2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/circle2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/circle2d.cpp:3958,3965,3967,3969 + /branches/local/src/node/x3d-geometry2d/circle2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/circle2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/circle2d.cpp:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-geometry2d/circle2d.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/circle2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/circle2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/circle2d.h:3958,3965,3967,3969 + /branches/local/src/node/x3d-geometry2d/circle2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/circle2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/circle2d.h:3958,3965,3967,3969,3971 Property changes on: branches/0.18/src/node/x3d-geometry2d/disk2d.cpp ___________________________________________________________________ Modified: svn... [truncated message content] |
From: <br...@us...> - 2009-07-30 08:20:53
|
Revision: 3974 http://openvrml.svn.sourceforge.net/openvrml/?rev=3974&view=rev Author: braden Date: 2009-07-30 08:20:15 +0000 (Thu, 30 Jul 2009) Log Message: ----------- Fixes for building on windows. Revert change that removed OPENVRML_JAVASCRIPT_API, OPENVRML_JAVASCRIPT_LOCAL, OPENVRML_JAVA_API, OPENVRML_JAVA_LOCAL, OPENVRML_GL_API, and OPENVRML_GL_LOCAL preprocessor definitions. Include Boost headers that appear to be necessary on Windows. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/configure.ac branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/javascript/javascript.vcproj branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj branches/0.18/src/libopenvrml/openvrml/event.h branches/0.18/src/libopenvrml/openvrml/field_value.h branches/0.18/src/libopenvrml/openvrml/node.h branches/0.18/src/libopenvrml-gl/openvrml/gl/viewer.cpp branches/0.18/src/libopenvrml-gl/openvrml/gl/viewer.h branches/0.18/src/script/java.cpp branches/0.18/src/script/javascript.cpp Property Changed: ---------------- branches/0.18/ branches/0.18/src/libopenvrml/openvrml/bad_url.cpp branches/0.18/src/libopenvrml/openvrml/bad_url.h branches/0.18/src/libopenvrml/openvrml/local/proto.cpp branches/0.18/src/libopenvrml/openvrml/local/proto.h branches/0.18/src/libopenvrml/openvrml/scene.cpp branches/0.18/src/libopenvrml/openvrml/scene.h branches/0.18/src/libopenvrml/openvrml/script.cpp branches/0.18/src/mozilla-plugin/ branches/0.18/src/node/vrml97/register_node_metatypes.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.h branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp branches/0.18/src/node/x3d-core/metadata_double.cpp branches/0.18/src/node/x3d-core/metadata_double.h branches/0.18/src/node/x3d-core/metadata_float.cpp branches/0.18/src/node/x3d-core/metadata_float.h branches/0.18/src/node/x3d-core/metadata_integer.cpp branches/0.18/src/node/x3d-core/metadata_integer.h branches/0.18/src/node/x3d-core/metadata_set.cpp branches/0.18/src/node/x3d-core/metadata_set.h branches/0.18/src/node/x3d-core/metadata_string.cpp branches/0.18/src/node/x3d-core/metadata_string.h branches/0.18/src/node/x3d-core/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/espdu_transform.cpp branches/0.18/src/node/x3d-dis/espdu_transform.h branches/0.18/src/node/x3d-dis/receiver_pdu.cpp branches/0.18/src/node/x3d-dis/receiver_pdu.h branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/signal_pdu.cpp branches/0.18/src/node/x3d-dis/signal_pdu.h branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp branches/0.18/src/node/x3d-dis/transmitter_pdu.h branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.h branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp branches/0.18/src/node/x3d-event-utilities/boolean_filter.h branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp branches/0.18/src/node/x3d-event-utilities/integer_trigger.h branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.h branches/0.18/src/node/x3d-geometry2d/arc2d.cpp branches/0.18/src/node/x3d-geometry2d/arc2d.h branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp branches/0.18/src/node/x3d-geometry2d/arc_close2d.h branches/0.18/src/node/x3d-geometry2d/circle2d.cpp branches/0.18/src/node/x3d-geometry2d/circle2d.h branches/0.18/src/node/x3d-geometry2d/disk2d.cpp branches/0.18/src/node/x3d-geometry2d/disk2d.h branches/0.18/src/node/x3d-geometry2d/polyline2d.cpp branches/0.18/src/node/x3d-geometry2d/polyline2d.h branches/0.18/src/node/x3d-geometry2d/polypoint2d.cpp branches/0.18/src/node/x3d-geometry2d/polypoint2d.h branches/0.18/src/node/x3d-geometry2d/rectangle2d.cpp branches/0.18/src/node/x3d-geometry2d/rectangle2d.h branches/0.18/src/node/x3d-geometry2d/register_node_metatypes.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.h branches/0.18/src/node/x3d-geospatial/geo_coordinate.cpp branches/0.18/src/node/x3d-geospatial/geo_coordinate.h branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.cpp branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.h branches/0.18/src/node/x3d-geospatial/geo_location.cpp branches/0.18/src/node/x3d-geospatial/geo_location.h branches/0.18/src/node/x3d-geospatial/geo_lod.cpp branches/0.18/src/node/x3d-geospatial/geo_lod.h branches/0.18/src/node/x3d-geospatial/geo_metadata.cpp branches/0.18/src/node/x3d-geospatial/geo_metadata.h branches/0.18/src/node/x3d-geospatial/geo_origin.cpp branches/0.18/src/node/x3d-geospatial/geo_origin.h branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.cpp branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.h branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.cpp branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.h branches/0.18/src/node/x3d-geospatial/geo_viewpoint.cpp branches/0.18/src/node/x3d-geospatial/geo_viewpoint.h branches/0.18/src/node/x3d-geospatial/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/static_group.cpp branches/0.18/src/node/x3d-grouping/static_group.h branches/0.18/src/node/x3d-h-anim/h_anim_displacer.cpp branches/0.18/src/node/x3d-h-anim/h_anim_displacer.h branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.cpp branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.h branches/0.18/src/node/x3d-h-anim/h_anim_joint.cpp branches/0.18/src/node/x3d-h-anim/h_anim_joint.h branches/0.18/src/node/x3d-h-anim/h_anim_segment.cpp branches/0.18/src/node/x3d-h-anim/h_anim_segment.h branches/0.18/src/node/x3d-h-anim/h_anim_site.cpp branches/0.18/src/node/x3d-h-anim/h_anim_site.h branches/0.18/src/node/x3d-h-anim/register_node_metatypes.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.h branches/0.18/src/node/x3d-interpolation/position_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/position_interpolator2d.h branches/0.18/src/node/x3d-interpolation/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.h branches/0.18/src/node/x3d-key-device-sensor/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.h branches/0.18/src/node/x3d-networking/load_sensor.cpp branches/0.18/src/node/x3d-networking/load_sensor.h branches/0.18/src/node/x3d-networking/register_node_metatypes.cpp branches/0.18/src/node/x3d-nurbs/contour2d.cpp branches/0.18/src/node/x3d-nurbs/contour2d.h branches/0.18/src/node/x3d-nurbs/contour_polyline2d.cpp branches/0.18/src/node/x3d-nurbs/contour_polyline2d.h branches/0.18/src/node/x3d-nurbs/coordinate_double.cpp branches/0.18/src/node/x3d-nurbs/coordinate_double.h branches/0.18/src/node/x3d-nurbs/nurbs_curve.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve.h branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.h branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_set.cpp branches/0.18/src/node/x3d-nurbs/nurbs_set.h branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.h branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.h branches/0.18/src/node/x3d-nurbs/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/color_rgba.cpp branches/0.18/src/node/x3d-rendering/color_rgba.h branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.h branches/0.18/src/node/x3d-rendering/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.h branches/0.18/src/node/x3d-rendering/triangle_set.cpp branches/0.18/src/node/x3d-rendering/triangle_set.h branches/0.18/src/node/x3d-rendering/triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/triangle_strip_set.h branches/0.18/src/node/x3d-shape/fill_properties.cpp branches/0.18/src/node/x3d-shape/fill_properties.h branches/0.18/src/node/x3d-shape/line_properties.cpp branches/0.18/src/node/x3d-shape/line_properties.h branches/0.18/src/node/x3d-shape/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/multi_texture.cpp branches/0.18/src/node/x3d-texturing/multi_texture.h branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.cpp branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.h branches/0.18/src/node/x3d-texturing/multi_texture_transform.cpp branches/0.18/src/node/x3d-texturing/multi_texture_transform.h branches/0.18/src/node/x3d-texturing/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.h Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2009-07-30 08:13:59 UTC (rev 3973) +++ branches/0.18/ChangeLog 2009-07-30 08:20:15 UTC (rev 3974) @@ -1,3 +1,36 @@ +2009-07-30 Braden McDaniel <br...@en...> + + Fixes for building on windows. Revert change that removed + OPENVRML_JAVASCRIPT_API, OPENVRML_JAVASCRIPT_LOCAL, + OPENVRML_JAVA_API, OPENVRML_JAVA_LOCAL, OPENVRML_GL_API, and + OPENVRML_GL_LOCAL preprocessor definitions. Include Boost headers + that appear to be necessary on Windows. + + * configure.ac: Revert change that removed + OPENVRML_JAVASCRIPT_API, OPENVRML_JAVASCRIPT_LOCAL, + OPENVRML_JAVA_API, and OPENVRML_JAVA_LOCAL preprocessor + definitions. + * ide-projects/Windows/VisualC9_0/OpenVRML/javascript/javascript.vcproj: + Define preprocessor symbols OPENVRML_JAVASCRIPT_API and + OPENVRML_JAVASCRIPT_LOCAL. + * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj: + Removed references to obsolete files + src/libopenvrml/openvrml/read_write_mutex.{cpp,h}. + * src/libopenvrml/openvrml/event.h: Do not apply OPENVRML_API to + node_field_value_listener; the Microsoft compiler does not like + __declspec(dllimport) applied to class templates. + * src/libopenvrml/openvrml/field_value.h: Include + <boost/thread/locks.hpp>. + * src/libopenvrml/openvrml/node.h: Include + <boost/thread/mutex.hpp>. + * src/libopenvrml-gl/openvrml/gl/viewer.cpp: Apply + OPENVRML_GL_LOCAL. + * src/libopenvrml-gl/openvrml/gl/viewer.h: Apply OPENVRML_GL_API. + * src/script/java.cpp: Apply OPENVRML_JAVA_API and + OPENVRML_JAVA_LOCAL. + * src/script/javascript.cpp: Apply OPENVRML_JAVASCRIPT_API and + OPENVRML_JAVASCRIPT_LOCAL. + 2009-07-13 Braden McDaniel <br...@en...> Apply OPENVRML_API to *_get_type functions for GTK+ widgets. Modified: branches/0.18/configure.ac =================================================================== --- branches/0.18/configure.ac 2009-07-30 08:13:59 UTC (rev 3973) +++ branches/0.18/configure.ac 2009-07-30 08:20:15 UTC (rev 3974) @@ -62,10 +62,27 @@ # OV_CXX_VISIBILITY( [OPENVRML_API="__attribute__((visibility(\"default\")))" -OPENVRML_LOCAL="__attribute__((visibility(\"hidden\")))"]) +OPENVRML_LOCAL="__attribute__((visibility(\"hidden\")))" +OPENVRML_GL_API="__attribute__((visibility(\"default\")))" +OPENVRML_GL_LOCAL="__attribute__((visibility(\"hidden\")))" +OPENVRML_JAVASCRIPT_API="__attribute__((visibility(\"default\")))" +OPENVRML_JAVASCRIPT_LOCAL="__attribute__((visibility(\"hidden\")))" +OPENVRML_JAVA_API="__attribute__((visibility(\"default\")))" +OPENVRML_JAVA_LOCAL="__attribute__((visibility(\"hidden\")))"]) AC_SUBST([OPENVRML_API]) AC_SUBST([OPENVRML_LOCAL]) +AC_SUBST([OPENVRML_GL_API]) +AC_SUBST([OPENVRML_GL_LOCAL]) +AC_DEFINE_UNQUOTED([OPENVRML_JAVASCRIPT_API], [$OPENVRML_JAVASCRIPT_API], + [Exported symbol]) +AC_DEFINE_UNQUOTED([OPENVRML_JAVASCRIPT_LOCAL], [$OPENVRML_JAVASCRIPT_LOCAL], + [Library-local symbol]) +AC_DEFINE_UNQUOTED([OPENVRML_JAVA_API], [$OPENVRML_JAVA_API], + [Exported symbol]) +AC_DEFINE_UNQUOTED([OPENVRML_JAVA_LOCAL], [$OPENVRML_JAVA_LOCAL], + [Library-local symbol]) + # # Checks for libraries/headers. # Modified: branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/javascript/javascript.vcproj =================================================================== --- branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/javascript/javascript.vcproj 2009-07-30 08:13:59 UTC (rev 3973) +++ branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/javascript/javascript.vcproj 2009-07-30 08:20:15 UTC (rev 3974) @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_SCL_SECURE_NO_WARNINGS;OPENVRML_USE_DLL;XP_WIN;JS_THREADSAFE;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_SCL_SECURE_NO_WARNINGS;OPENVRML_USE_DLL;XP_WIN;JS_THREADSAFE;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_JAVASCRIPT_API=__declspec(dllexport);OPENVRML_JAVASCRIPT_LOCAL=" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" Modified: branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj =================================================================== --- branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj 2009-07-30 08:13:59 UTC (rev 3973) +++ branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj 2009-07-30 08:20:15 UTC (rev 3974) @@ -276,10 +276,6 @@ > </File> <File - RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\read_write_mutex.cpp" - > - </File> - <File RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\rendering_context.cpp" > </File> @@ -401,10 +397,6 @@ > </File> <File - RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\read_write_mutex.h" - > - </File> - <File RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\rendering_context.h" > </File> Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971 + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973 Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971 + /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973 Modified: branches/0.18/src/libopenvrml/openvrml/event.h =================================================================== --- branches/0.18/src/libopenvrml/openvrml/event.h 2009-07-30 08:13:59 UTC (rev 3973) +++ branches/0.18/src/libopenvrml/openvrml/event.h 2009-07-30 08:20:15 UTC (rev 3974) @@ -133,7 +133,7 @@ template <typename FieldValue> - class OPENVRML_API node_field_value_listener : + class node_field_value_listener : public virtual node_event_listener, public field_value_listener<FieldValue> { public: Modified: branches/0.18/src/libopenvrml/openvrml/field_value.h =================================================================== --- branches/0.18/src/libopenvrml/openvrml/field_value.h 2009-07-30 08:13:59 UTC (rev 3973) +++ branches/0.18/src/libopenvrml/openvrml/field_value.h 2009-07-30 08:20:15 UTC (rev 3974) @@ -31,6 +31,7 @@ # include <boost/scoped_ptr.hpp> # include <boost/shared_ptr.hpp> # include <boost/utility.hpp> +# include <boost/thread/locks.hpp> # include <boost/thread/shared_mutex.hpp> # include <openvrml/basetypes.h> Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973 Modified: branches/0.18/src/libopenvrml/openvrml/node.h =================================================================== --- branches/0.18/src/libopenvrml/openvrml/node.h 2009-07-30 08:13:59 UTC (rev 3973) +++ branches/0.18/src/libopenvrml/openvrml/node.h 2009-07-30 08:20:15 UTC (rev 3974) @@ -25,6 +25,7 @@ # include <openvrml/field_value.h> # include <openvrml/rendering_context.h> # include <boost/bind.hpp> +# include <boost/thread/mutex.hpp> # include <deque> # include <map> # include <set> Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971 + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971 + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973 Property changes on: branches/0.18/src/libopenvrml/openvrml/script.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971 + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973 Modified: branches/0.18/src/libopenvrml-gl/openvrml/gl/viewer.cpp =================================================================== --- branches/0.18/src/libopenvrml-gl/openvrml/gl/viewer.cpp 2009-07-30 08:13:59 UTC (rev 3973) +++ branches/0.18/src/libopenvrml-gl/openvrml/gl/viewer.cpp 2009-07-30 08:20:15 UTC (rev 3974) @@ -75,12 +75,12 @@ const double inv_pi = 0.31830988618379067154; template <typename Float> - OPENVRML_LOCAL inline Float fabs(const Float f) + OPENVRML_GL_LOCAL inline Float fabs(const Float f) { return f < 0.0 ? -f : f; } - struct OPENVRML_LOCAL fequal_t { + struct OPENVRML_GL_LOCAL fequal_t { template <typename Float> bool operator()(Float a, Float b) const { @@ -96,7 +96,7 @@ const fequal_t fequal = fequal_t(); - class OPENVRML_LOCAL gl_capabilities { + class OPENVRML_GL_LOCAL gl_capabilities { public: GLint max_modelview_stack_depth; GLint max_texture_size; @@ -130,7 +130,7 @@ } - struct OPENVRML_LOCAL vertex_data { + struct OPENVRML_GL_LOCAL vertex_data { GLdouble coord[3]; const openvrml::color * color; const openvrml::vec3f * normal; @@ -146,14 +146,14 @@ {} - struct OPENVRML_LOCAL combined_vertex_data_ { + struct OPENVRML_GL_LOCAL combined_vertex_data_ { openvrml::color color; openvrml::vec3f normal; openvrml::vec2f tex_coord; }; - struct OPENVRML_LOCAL shell_tess_user_data { + struct OPENVRML_GL_LOCAL shell_tess_user_data { size_t face_index; const std::vector<openvrml::color> * face_color; const std::vector<openvrml::int32> * face_color_index; @@ -177,7 +177,7 @@ /** * @internal */ - struct OPENVRML_LOCAL ShellData { + struct OPENVRML_GL_LOCAL ShellData { unsigned int mask; const std::vector<openvrml::vec3f> & coord; const std::vector<openvrml::int32> & coordIndex; @@ -232,7 +232,7 @@ {} // Generate a normal from 3 indexed points. - OPENVRML_LOCAL const openvrml::vec3f + OPENVRML_GL_LOCAL const openvrml::vec3f indexFaceNormal(const size_t i1, const size_t i2, const size_t i3, @@ -811,7 +811,7 @@ // Project an x, y pair onto a sphere of radius r OR a hyperbolic sheet // if we are away from the center of the sphere. // - OPENVRML_LOCAL float tb_project_to_sphere(float r, float x, float y) + OPENVRML_GL_LOCAL float tb_project_to_sphere(float r, float x, float y) { static const double sqrt2 = sqrt(2.0); static const double sqrt2_2 = sqrt2 / 2.0; @@ -839,10 +839,10 @@ // It is assumed that the arguments to this routine are in the range // (-1.0 ... 1.0) // - OPENVRML_LOCAL const openvrml::rotation trackball(float p1x, - float p1y, - float p2x, - float p2y) + OPENVRML_GL_LOCAL const openvrml::rotation trackball(float p1x, + float p1y, + float p2x, + float p2y) { using openvrml::rotation; using openvrml::make_rotation; @@ -1007,7 +1007,7 @@ namespace { // Call this after each frame for debugging... - OPENVRML_LOCAL void checkErrors(const std::string & s) + OPENVRML_GL_LOCAL void checkErrors(const std::string & s) { GLenum glerr; while ((glerr = glGetError()) != GL_NO_ERROR) { @@ -1534,12 +1534,12 @@ * It might be smarter to do just one, and reference it with scaling (but * the world creator could just as easily do that with DEF/USE ...). */ - OPENVRML_LOCAL void computeCylinder(const double height, - const double radius, - const int numFacets, - float (*c)[3], - float (*tc)[3], - int * faces) + OPENVRML_GL_LOCAL void computeCylinder(const double height, + const double radius, + const int numFacets, + float (*c)[3], + float (*tc)[3], + int * faces) { double angle, x, y; int i, polyIndex; @@ -1785,7 +1785,7 @@ // Compute a normal at vert i,j of an ElevationGrid. - OPENVRML_LOCAL const openvrml::vec3f elevationVertexNormal( + OPENVRML_GL_LOCAL const openvrml::vec3f elevationVertexNormal( const int i, const int j, const int nx, const int nz, const float dx, const float dz, @@ -1974,7 +1974,7 @@ // Extrusion cap tessellation for non-convex shapes - struct OPENVRML_LOCAL TessExtrusion { + struct OPENVRML_GL_LOCAL TessExtrusion { const float * c; // coordinates array [nVerts * 3] const float * crossSection; // crossSection coordinates [nCrossSection * 2] float tcDeltaU, tcDeltaV; @@ -2050,7 +2050,7 @@ namespace { - OPENVRML_LOCAL void + OPENVRML_GL_LOCAL void insertExtrusionCaps(GLUtesselator & tesselator, const unsigned int mask, const size_t nSpine, @@ -2197,7 +2197,7 @@ * @return the length of the Extrusion spine described by @p spine; or 1.0 * if the length is 0. */ - OPENVRML_LOCAL + OPENVRML_GL_LOCAL float get_spine_length(const std::vector<openvrml::vec3f> & spine) { using std::vector; @@ -2227,7 +2227,7 @@ * @return the length of the Extrusion cross-section described by * @p cross_section; or 1.0 if the length is 0. */ - OPENVRML_LOCAL + OPENVRML_GL_LOCAL float get_cross_section_length( const std::vector<openvrml::vec2f> & cross_section) @@ -2255,7 +2255,7 @@ * @return the <var>y</var>-axis of the spine-aligned cross-section plane * at @p point. */ - OPENVRML_LOCAL + OPENVRML_GL_LOCAL const openvrml::vec3f compute_scp_y_axis( const std::vector<openvrml::vec3f>::const_iterator & point, @@ -2302,7 +2302,7 @@ * @return the <var>z</var>axis of the spine-aligned cross-section plane * at @p point. */ - OPENVRML_LOCAL + OPENVRML_GL_LOCAL const openvrml::vec3f compute_scp_z_axis( const std::vector<openvrml::vec3f>::const_iterator & point, @@ -2372,7 +2372,7 @@ * @return @c true if the points in @p spine are collinear; @c false * otherwise. */ - OPENVRML_LOCAL + OPENVRML_GL_LOCAL bool check_spine_points_collinear(const std::vector<openvrml::vec3f> & spine, openvrml::vec3f & scp_x, @@ -2466,7 +2466,7 @@ * @param[out] coord * @param[out] texcoord */ - OPENVRML_LOCAL void + OPENVRML_GL_LOCAL void compute_extrusion_coords_( const std::vector<openvrml::vec2f> & cross_section, const std::vector<openvrml::vec3f> & spine, @@ -2794,9 +2794,9 @@ namespace { - OPENVRML_LOCAL void computeBounds(size_t npoints, - const float * points, - float (&bounds)[6]) + OPENVRML_GL_LOCAL void computeBounds(size_t npoints, + const float * points, + float (&bounds)[6]) { if (npoints == 0) { std::fill(bounds, bounds + 6, 0.0f); @@ -2817,9 +2817,9 @@ } } - OPENVRML_LOCAL void texGenParams(float (&bounds)[6], // xmin,xmax, ymin,ymax, zmin,zmax - int (&axes)[2], // s, t - float (¶ms)[4]) // s0, 1/sSize, t0, 1/tSize + OPENVRML_GL_LOCAL void texGenParams(float (&bounds)[6], // xmin,xmax, ymin,ymax, zmin,zmax + int (&axes)[2], // s, t + float (¶ms)[4]) // s0, 1/sSize, t0, 1/tSize { axes[0] = 0; axes[1] = 1; @@ -2848,7 +2848,7 @@ params[3] = float(1.0 / params[3]); } - OPENVRML_LOCAL void insertShellConvex(ShellData * const s) + OPENVRML_GL_LOCAL void insertShellConvex(ShellData * const s) { using openvrml::vec3f; using openvrml::gl::viewer; @@ -2951,7 +2951,7 @@ } } - OPENVRML_LOCAL void + OPENVRML_GL_LOCAL void insertShellTess(GLUtesselator & tessobj, const std::vector<vertex_data> & vertices, const std::vector<openvrml::int32> & coord_index, @@ -3202,11 +3202,11 @@ namespace { - OPENVRML_LOCAL void computeSphere(const double radius, - const int numLatLong, - float (*c)[3], - float (*tc)[3], - int *faces) + OPENVRML_GL_LOCAL void computeSphere(const double radius, + const int numLatLong, + float (*c)[3], + float (*tc)[3], + int *faces) { double r, angle, x, y, z; int i, j, polyIndex; @@ -3669,7 +3669,7 @@ namespace { - OPENVRML_LOCAL inline bool power_of_2(unsigned long n) + OPENVRML_GL_LOCAL inline bool power_of_2(unsigned long n) { return !(n & (n - 1)); } @@ -3863,11 +3863,11 @@ /** * Compute a target and up vector from position/orientation/distance. */ - OPENVRML_LOCAL void computeView(const openvrml::vec3f & position, - const openvrml::rotation & orientation, - const float distance, - openvrml::vec3f & target, - openvrml::vec3f & up) + OPENVRML_GL_LOCAL void computeView(const openvrml::vec3f & position, + const openvrml::rotation & orientation, + const float distance, + openvrml::vec3f & target, + openvrml::vec3f & up) { // Graphics Gems, p 466. Convert between axis/angle and rotation matrix Modified: branches/0.18/src/libopenvrml-gl/openvrml/gl/viewer.h =================================================================== --- branches/0.18/src/libopenvrml-gl/openvrml/gl/viewer.h 2009-07-30 08:13:59 UTC (rev 3973) +++ branches/0.18/src/libopenvrml-gl/openvrml/gl/viewer.h 2009-07-30 08:20:15 UTC (rev 3974) @@ -43,7 +43,7 @@ namespace gl { - class OPENVRML_API viewer : public openvrml::viewer { + class OPENVRML_GL_API viewer : public openvrml::viewer { typedef std::map<const node *, GLuint> list_map_t; struct delete_list; list_map_t list_map_; Property changes on: branches/0.18/src/mozilla-plugin ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971 + /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973 Property changes on: branches/0.18/src/node/vrml97/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971 + /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973 Property changes on: branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971 + /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971 + /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971 + /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971 + /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971 + /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971 + /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971 + /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971 + /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971 + /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971 + /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971 + /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973 Property changes on: branches/0.18/src/node/x3d-core/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971 + /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971 + /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971 + /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971 + /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971 + /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973 Property changes on: branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971 + /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967,3969,3971 + /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967,3969,3971,3973 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.h:3958,3965,3967,3969,3971 + /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.h:3958,3965,3967,3969,3971,3973 Property changes on: branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.cpp:3958,3965,3967,3969,3971 + /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.cpp:3958,3965,3967,3969,3971,3973 Property changes on: branches/0.18/src/node/x3d-dis/transmitter_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.h:3958,3965,3967,3969,3971 + /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.h:3958,3965,3967,3969,3971,3973 Property changes on: branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 /trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3958,3965,3967,3969,3971 + /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 /trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973 Property changes on: branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.cpp:3958,3965,3967,3969,3971 + /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.cpp:3958,3965,3967,3969,3971,3973 Property changes on: branches/0.18/src/node/x3d-environmental-effects/texture_background.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.h:3958,3965,3967,3969,3971 + /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.h:3958,3965,3967,3969,3971,3973 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp ___________________________________________________________________ Mod... [truncated message content] |
From: <br...@us...> - 2009-08-02 04:32:51
|
Revision: 3977 http://openvrml.svn.sourceforge.net/openvrml/?rev=3977&view=rev Author: braden Date: 2009-08-02 04:32:42 +0000 (Sun, 02 Aug 2009) Log Message: ----------- Removed obsolete path separator definition. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/src/script/java.cpp Property Changed: ---------------- branches/0.18/ branches/0.18/src/libopenvrml/openvrml/bad_url.cpp branches/0.18/src/libopenvrml/openvrml/bad_url.h branches/0.18/src/libopenvrml/openvrml/local/proto.cpp branches/0.18/src/libopenvrml/openvrml/local/proto.h branches/0.18/src/libopenvrml/openvrml/scene.cpp branches/0.18/src/libopenvrml/openvrml/scene.h branches/0.18/src/libopenvrml/openvrml/script.cpp branches/0.18/src/mozilla-plugin/ branches/0.18/src/node/vrml97/register_node_metatypes.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.h branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp branches/0.18/src/node/x3d-core/metadata_double.cpp branches/0.18/src/node/x3d-core/metadata_double.h branches/0.18/src/node/x3d-core/metadata_float.cpp branches/0.18/src/node/x3d-core/metadata_float.h branches/0.18/src/node/x3d-core/metadata_integer.cpp branches/0.18/src/node/x3d-core/metadata_integer.h branches/0.18/src/node/x3d-core/metadata_set.cpp branches/0.18/src/node/x3d-core/metadata_set.h branches/0.18/src/node/x3d-core/metadata_string.cpp branches/0.18/src/node/x3d-core/metadata_string.h branches/0.18/src/node/x3d-core/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/espdu_transform.cpp branches/0.18/src/node/x3d-dis/espdu_transform.h branches/0.18/src/node/x3d-dis/receiver_pdu.cpp branches/0.18/src/node/x3d-dis/receiver_pdu.h branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/signal_pdu.cpp branches/0.18/src/node/x3d-dis/signal_pdu.h branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp branches/0.18/src/node/x3d-dis/transmitter_pdu.h branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.h branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp branches/0.18/src/node/x3d-event-utilities/boolean_filter.h branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp branches/0.18/src/node/x3d-event-utilities/integer_trigger.h branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.h branches/0.18/src/node/x3d-geometry2d/arc2d.cpp branches/0.18/src/node/x3d-geometry2d/arc2d.h branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp branches/0.18/src/node/x3d-geometry2d/arc_close2d.h branches/0.18/src/node/x3d-geometry2d/circle2d.cpp branches/0.18/src/node/x3d-geometry2d/circle2d.h branches/0.18/src/node/x3d-geometry2d/disk2d.cpp branches/0.18/src/node/x3d-geometry2d/disk2d.h branches/0.18/src/node/x3d-geometry2d/polyline2d.cpp branches/0.18/src/node/x3d-geometry2d/polyline2d.h branches/0.18/src/node/x3d-geometry2d/polypoint2d.cpp branches/0.18/src/node/x3d-geometry2d/polypoint2d.h branches/0.18/src/node/x3d-geometry2d/rectangle2d.cpp branches/0.18/src/node/x3d-geometry2d/rectangle2d.h branches/0.18/src/node/x3d-geometry2d/register_node_metatypes.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.h branches/0.18/src/node/x3d-geospatial/geo_coordinate.cpp branches/0.18/src/node/x3d-geospatial/geo_coordinate.h branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.cpp branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.h branches/0.18/src/node/x3d-geospatial/geo_location.cpp branches/0.18/src/node/x3d-geospatial/geo_location.h branches/0.18/src/node/x3d-geospatial/geo_lod.cpp branches/0.18/src/node/x3d-geospatial/geo_lod.h branches/0.18/src/node/x3d-geospatial/geo_metadata.cpp branches/0.18/src/node/x3d-geospatial/geo_metadata.h branches/0.18/src/node/x3d-geospatial/geo_origin.cpp branches/0.18/src/node/x3d-geospatial/geo_origin.h branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.cpp branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.h branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.cpp branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.h branches/0.18/src/node/x3d-geospatial/geo_viewpoint.cpp branches/0.18/src/node/x3d-geospatial/geo_viewpoint.h branches/0.18/src/node/x3d-geospatial/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/static_group.cpp branches/0.18/src/node/x3d-grouping/static_group.h branches/0.18/src/node/x3d-h-anim/h_anim_displacer.cpp branches/0.18/src/node/x3d-h-anim/h_anim_displacer.h branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.cpp branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.h branches/0.18/src/node/x3d-h-anim/h_anim_joint.cpp branches/0.18/src/node/x3d-h-anim/h_anim_joint.h branches/0.18/src/node/x3d-h-anim/h_anim_segment.cpp branches/0.18/src/node/x3d-h-anim/h_anim_segment.h branches/0.18/src/node/x3d-h-anim/h_anim_site.cpp branches/0.18/src/node/x3d-h-anim/h_anim_site.h branches/0.18/src/node/x3d-h-anim/register_node_metatypes.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.h branches/0.18/src/node/x3d-interpolation/position_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/position_interpolator2d.h branches/0.18/src/node/x3d-interpolation/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.h branches/0.18/src/node/x3d-key-device-sensor/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.h branches/0.18/src/node/x3d-networking/load_sensor.cpp branches/0.18/src/node/x3d-networking/load_sensor.h branches/0.18/src/node/x3d-networking/register_node_metatypes.cpp branches/0.18/src/node/x3d-nurbs/contour2d.cpp branches/0.18/src/node/x3d-nurbs/contour2d.h branches/0.18/src/node/x3d-nurbs/contour_polyline2d.cpp branches/0.18/src/node/x3d-nurbs/contour_polyline2d.h branches/0.18/src/node/x3d-nurbs/coordinate_double.cpp branches/0.18/src/node/x3d-nurbs/coordinate_double.h branches/0.18/src/node/x3d-nurbs/nurbs_curve.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve.h branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.h branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_set.cpp branches/0.18/src/node/x3d-nurbs/nurbs_set.h branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.h branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.h branches/0.18/src/node/x3d-nurbs/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/color_rgba.cpp branches/0.18/src/node/x3d-rendering/color_rgba.h branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.h branches/0.18/src/node/x3d-rendering/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.h branches/0.18/src/node/x3d-rendering/triangle_set.cpp branches/0.18/src/node/x3d-rendering/triangle_set.h branches/0.18/src/node/x3d-rendering/triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/triangle_strip_set.h branches/0.18/src/node/x3d-shape/fill_properties.cpp branches/0.18/src/node/x3d-shape/fill_properties.h branches/0.18/src/node/x3d-shape/line_properties.cpp branches/0.18/src/node/x3d-shape/line_properties.h branches/0.18/src/node/x3d-shape/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/multi_texture.cpp branches/0.18/src/node/x3d-texturing/multi_texture.h branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.cpp branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.h branches/0.18/src/node/x3d-texturing/multi_texture_transform.cpp branches/0.18/src/node/x3d-texturing/multi_texture_transform.h branches/0.18/src/node/x3d-texturing/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.h Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2009-08-02 02:19:33 UTC (rev 3976) +++ branches/0.18/ChangeLog 2009-08-02 04:32:42 UTC (rev 3977) @@ -1,3 +1,7 @@ +2009-08-01 Braden McDaniel <br...@en...> + + * src/script/java.cpp: Removed obsolete path separator definition. + 2009-07-30 Braden McDaniel <br...@en...> Fixes for building on windows. Revert change that removed Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973 + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973 + /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973 + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973 + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/libopenvrml/openvrml/script.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973 + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/mozilla-plugin ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973 + /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/vrml97/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973 + /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973 + /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-core/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973 + /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973 + /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.h:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.h:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.cpp:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.cpp:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-dis/transmitter_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.h:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.h:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 /trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973 + /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 /trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.cpp:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.cpp:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-environmental-effects/texture_background.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.h:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.h:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.cpp:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.cpp:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_filter.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.h:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.h:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.h:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.h:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.cpp:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.cpp:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.h:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.h:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.cpp:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.cpp:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.h:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.h:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.cpp:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.h:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.h:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.cpp:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.cpp:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.h:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-event-utilities/integer_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.h:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3734 /trunk/src/node/x3d-event-utilities/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973 + /branches/0.17/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3734 /trunk/src/node/x3d-event-utilities/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/time_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/time_trigger.cpp:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-event-utilities/time_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/time_trigger.cpp:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-event-utilities/time_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/time_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/time_trigger.h:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-event-utilities/time_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/time_trigger.h:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-geometry2d/arc2d.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/arc2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc2d.cpp:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-geometry2d/arc2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc2d.cpp:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-geometry2d/arc2d.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/arc2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc2d.h:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-geometry2d/arc2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc2d.h:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/arc_close2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc_close2d.cpp:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-geometry2d/arc_close2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc_close2d.cpp:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-geometry2d/arc_close2d.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/arc_close2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc_close2d.h:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-geometry2d/arc_close2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/arc_close2d.h:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-geometry2d/circle2d.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-geometry2d/circle2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/circle2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/circle2d.cpp:3958,3965,3967,3969,3971,3973 + /branches/local/src/node/x3d-geometry2d/circle2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/circle2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 /trunk/src/node/x3d-geometry2d/circle2d.cpp:3958,3965,3967,3969,3971,3973,3975 Property changes on: branches/0.18/src/node/x3d-geometry2d/circle2d.h ___________________________________________________________________ Modified: svn:mergeinfo - /bra... [truncated message content] |
From: <br...@us...> - 2009-08-02 04:38:40
|
Revision: 3978 http://openvrml.svn.sourceforge.net/openvrml/?rev=3978&view=rev Author: braden Date: 2009-08-02 04:38:31 +0000 (Sun, 02 Aug 2009) Log Message: ----------- Moved src/libopenvrml-control to src/local/libopenvrml-control. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/src/Makefile.am Added Paths: ----------- branches/0.18/src/local/ branches/0.18/src/local/libopenvrml-control/ branches/0.18/src/local/libopenvrml-control/openvrml_control/ branches/0.18/src/local/libopenvrml-control/openvrml_control/browser.cpp branches/0.18/src/local/libopenvrml-control/openvrml_control/browser.h Removed Paths: ------------- branches/0.18/src/libopenvrml-control/ branches/0.18/src/local/libopenvrml-control/ branches/0.18/src/local/libopenvrml-control/openvrml_control/ branches/0.18/src/local/libopenvrml-control/openvrml_control/browser.cpp branches/0.18/src/local/libopenvrml-control/openvrml_control/browser.h Property Changed: ---------------- branches/0.18/ branches/0.18/src/libopenvrml/openvrml/bad_url.cpp branches/0.18/src/libopenvrml/openvrml/bad_url.h branches/0.18/src/libopenvrml/openvrml/local/proto.cpp branches/0.18/src/libopenvrml/openvrml/local/proto.h branches/0.18/src/libopenvrml/openvrml/scene.cpp branches/0.18/src/libopenvrml/openvrml/scene.h branches/0.18/src/libopenvrml/openvrml/script.cpp branches/0.18/src/mozilla-plugin/ branches/0.18/src/node/vrml97/register_node_metatypes.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.h branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp branches/0.18/src/node/x3d-core/metadata_double.cpp branches/0.18/src/node/x3d-core/metadata_double.h branches/0.18/src/node/x3d-core/metadata_float.cpp branches/0.18/src/node/x3d-core/metadata_float.h branches/0.18/src/node/x3d-core/metadata_integer.cpp branches/0.18/src/node/x3d-core/metadata_integer.h branches/0.18/src/node/x3d-core/metadata_set.cpp branches/0.18/src/node/x3d-core/metadata_set.h branches/0.18/src/node/x3d-core/metadata_string.cpp branches/0.18/src/node/x3d-core/metadata_string.h branches/0.18/src/node/x3d-core/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/espdu_transform.cpp branches/0.18/src/node/x3d-dis/espdu_transform.h branches/0.18/src/node/x3d-dis/receiver_pdu.cpp branches/0.18/src/node/x3d-dis/receiver_pdu.h branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/signal_pdu.cpp branches/0.18/src/node/x3d-dis/signal_pdu.h branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp branches/0.18/src/node/x3d-dis/transmitter_pdu.h branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.h branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp branches/0.18/src/node/x3d-event-utilities/boolean_filter.h branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp branches/0.18/src/node/x3d-event-utilities/integer_trigger.h branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.h branches/0.18/src/node/x3d-geometry2d/arc2d.cpp branches/0.18/src/node/x3d-geometry2d/arc2d.h branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp branches/0.18/src/node/x3d-geometry2d/arc_close2d.h branches/0.18/src/node/x3d-geometry2d/circle2d.cpp branches/0.18/src/node/x3d-geometry2d/circle2d.h branches/0.18/src/node/x3d-geometry2d/disk2d.cpp branches/0.18/src/node/x3d-geometry2d/disk2d.h branches/0.18/src/node/x3d-geometry2d/polyline2d.cpp branches/0.18/src/node/x3d-geometry2d/polyline2d.h branches/0.18/src/node/x3d-geometry2d/polypoint2d.cpp branches/0.18/src/node/x3d-geometry2d/polypoint2d.h branches/0.18/src/node/x3d-geometry2d/rectangle2d.cpp branches/0.18/src/node/x3d-geometry2d/rectangle2d.h branches/0.18/src/node/x3d-geometry2d/register_node_metatypes.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.h branches/0.18/src/node/x3d-geospatial/geo_coordinate.cpp branches/0.18/src/node/x3d-geospatial/geo_coordinate.h branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.cpp branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.h branches/0.18/src/node/x3d-geospatial/geo_location.cpp branches/0.18/src/node/x3d-geospatial/geo_location.h branches/0.18/src/node/x3d-geospatial/geo_lod.cpp branches/0.18/src/node/x3d-geospatial/geo_lod.h branches/0.18/src/node/x3d-geospatial/geo_metadata.cpp branches/0.18/src/node/x3d-geospatial/geo_metadata.h branches/0.18/src/node/x3d-geospatial/geo_origin.cpp branches/0.18/src/node/x3d-geospatial/geo_origin.h branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.cpp branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.h branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.cpp branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.h branches/0.18/src/node/x3d-geospatial/geo_viewpoint.cpp branches/0.18/src/node/x3d-geospatial/geo_viewpoint.h branches/0.18/src/node/x3d-geospatial/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/static_group.cpp branches/0.18/src/node/x3d-grouping/static_group.h branches/0.18/src/node/x3d-h-anim/h_anim_displacer.cpp branches/0.18/src/node/x3d-h-anim/h_anim_displacer.h branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.cpp branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.h branches/0.18/src/node/x3d-h-anim/h_anim_joint.cpp branches/0.18/src/node/x3d-h-anim/h_anim_joint.h branches/0.18/src/node/x3d-h-anim/h_anim_segment.cpp branches/0.18/src/node/x3d-h-anim/h_anim_segment.h branches/0.18/src/node/x3d-h-anim/h_anim_site.cpp branches/0.18/src/node/x3d-h-anim/h_anim_site.h branches/0.18/src/node/x3d-h-anim/register_node_metatypes.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.h branches/0.18/src/node/x3d-interpolation/position_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/position_interpolator2d.h branches/0.18/src/node/x3d-interpolation/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.h branches/0.18/src/node/x3d-key-device-sensor/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.h branches/0.18/src/node/x3d-networking/load_sensor.cpp branches/0.18/src/node/x3d-networking/load_sensor.h branches/0.18/src/node/x3d-networking/register_node_metatypes.cpp branches/0.18/src/node/x3d-nurbs/contour2d.cpp branches/0.18/src/node/x3d-nurbs/contour2d.h branches/0.18/src/node/x3d-nurbs/contour_polyline2d.cpp branches/0.18/src/node/x3d-nurbs/contour_polyline2d.h branches/0.18/src/node/x3d-nurbs/coordinate_double.cpp branches/0.18/src/node/x3d-nurbs/coordinate_double.h branches/0.18/src/node/x3d-nurbs/nurbs_curve.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve.h branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.h branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_set.cpp branches/0.18/src/node/x3d-nurbs/nurbs_set.h branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.h branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.h branches/0.18/src/node/x3d-nurbs/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/color_rgba.cpp branches/0.18/src/node/x3d-rendering/color_rgba.h branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.h branches/0.18/src/node/x3d-rendering/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.h branches/0.18/src/node/x3d-rendering/triangle_set.cpp branches/0.18/src/node/x3d-rendering/triangle_set.h branches/0.18/src/node/x3d-rendering/triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/triangle_strip_set.h branches/0.18/src/node/x3d-shape/fill_properties.cpp branches/0.18/src/node/x3d-shape/fill_properties.h branches/0.18/src/node/x3d-shape/line_properties.cpp branches/0.18/src/node/x3d-shape/line_properties.h branches/0.18/src/node/x3d-shape/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/multi_texture.cpp branches/0.18/src/node/x3d-texturing/multi_texture.h branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.cpp branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.h branches/0.18/src/node/x3d-texturing/multi_texture_transform.cpp branches/0.18/src/node/x3d-texturing/multi_texture_transform.h branches/0.18/src/node/x3d-texturing/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.h Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2009-08-02 04:32:42 UTC (rev 3977) +++ branches/0.18/ChangeLog 2009-08-02 04:38:31 UTC (rev 3978) @@ -1,5 +1,12 @@ 2009-08-01 Braden McDaniel <br...@en...> + Moved src/libopenvrml-control to src/local/libopenvrml-control. + + * src/Makefile.am + * src/local/libopenvrml-control + +2009-08-01 Braden McDaniel <br...@en...> + * src/script/java.cpp: Removed obsolete path separator definition. 2009-07-30 Braden McDaniel <br...@en...> Modified: branches/0.18/src/Makefile.am =================================================================== --- branches/0.18/src/Makefile.am 2009-08-02 04:32:42 UTC (rev 3977) +++ branches/0.18/src/Makefile.am 2009-08-02 04:38:31 UTC (rev 3978) @@ -719,7 +719,7 @@ libopenvrml_gl_libopenvrml_gl_la_LIBADD = libopenvrml/libopenvrml.la if ENABLE_XEMBED -noinst_LTLIBRARIES = libopenvrml-control/libopenvrml-control.la +noinst_LTLIBRARIES = local/libopenvrml-control.la libexec_PROGRAMS = openvrml-xembed/openvrml-xembed session_bus_servicesdir = $(datadir)/dbus-1/services session_bus_services_DATA = openvrml-xembed/org.openvrml.BrowserControl.service @@ -728,18 +728,18 @@ openvrml-xembed/browser-factory-server-glue.h \ openvrml-xembed/browser-host-client-glue.h endif -libopenvrml_control_libopenvrml_control_la_SOURCES = \ - libopenvrml-control/openvrml_control/browser.cpp \ - libopenvrml-control/openvrml_control/browser.h -libopenvrml_control_libopenvrml_control_la_CPPFLAGS = \ +local_libopenvrml_control_la_SOURCES = \ + local/libopenvrml-control/openvrml_control/browser.cpp \ + local/libopenvrml-control/openvrml_control/browser.h +local_libopenvrml_control_la_CPPFLAGS = \ -I$(top_builddir)/src/libopenvrml \ -I$(top_srcdir)/src/libopenvrml -libopenvrml_control_libopenvrml_control_la_LIBADD = \ +local_libopenvrml_control_la_LIBADD = \ libopenvrml/libopenvrml.la openvrml_xembed_openvrml_xembed_CPPFLAGS = \ -I$(top_builddir)/src/openvrml-xembed \ - -I$(top_srcdir)/src/libopenvrml-control \ + -I$(top_srcdir)/src/local/libopenvrml-control \ -I$(top_builddir)/src/libopenvrml \ -I$(top_srcdir)/src/libopenvrml \ -I$(top_builddir)/src/libopenvrml-gl \ @@ -761,7 +761,7 @@ $(DBUS_G_LIBS) \ $(GTKGL_LIBS) openvrml_xembed_openvrml_xembed_LDADD = \ - libopenvrml-control/libopenvrml-control.la \ + local/libopenvrml-control.la \ libopenvrml-gl/libopenvrml-gl.la openvrml_xembed_datadir = $(datadir)/openvrml-xembed Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975 + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976 Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975 + /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975 + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975 + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976 Property changes on: branches/0.18/src/libopenvrml/openvrml/script.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975 + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976 Deleted: branches/0.18/src/local/libopenvrml-control/openvrml_control/browser.cpp =================================================================== --- trunk/src/local/libopenvrml-control/openvrml_control/browser.cpp 2009-08-02 02:19:33 UTC (rev 3976) +++ branches/0.18/src/local/libopenvrml-control/openvrml_control/browser.cpp 2009-08-02 04:38:31 UTC (rev 3978) @@ -1,806 +0,0 @@ -// -*- mode: c++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*- -// -// OpenVRML Control -// -// Copyright 2009 Braden N. McDaniel -// -// This program 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; either version 3 of the License, or (at your option) -// any later version. -// -// This program 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; if not, see <http://www.gnu.org/licenses/>. -// - -# include "browser.h" -# include <boost/enable_shared_from_this.hpp> -# include <boost/lexical_cast.hpp> -# include <boost/thread/condition.hpp> -# include <iostream> - -openvrml_control::unknown_stream::unknown_stream(const std::string & uri): - std::logic_error("no stream corresponding to URI: " + uri) -{} - -openvrml_control::unknown_stream::unknown_stream(const uint64_t stream_id): - std::logic_error("no stream corresponding to stream ID: " - + boost::lexical_cast<std::string>(stream_id)) -{} - -openvrml_control::unknown_stream::~unknown_stream() throw () -{} - -// -// plugin_streambuf Life Cycle -// -// A plugin_streambuf is first created in -// browser::resource_fetcher::do_get_resource (which is called whenever -// libopenvrml needs to load a stream). -// -// Step 1: Requested plugin_streambuf -// -// Upon creation, the plugin_streambuf is inserted into the -// unintialized_plugin_streambuf_map with an initial plugin_streambuf::state -// of requested. do_get_resource does not complete until the result of asking -// the host application to resolve the URL is known; i.e., -// plugin_streambuf::get_url_result. get_url_result blocks until the response -// is received from the host application; i.e., until -// plugin_streambuf::set_get_url_result has been called. -// -// Step 2: Uninitialized plugin_streambuf -// -// If plugin_streambuf::set_get_url_result is given a result code indicating -// success (i.e., 0), the plugin_streambuf::state is changed to uninitialized -// (otherwise, the stream is removed from the -// uninitialized_plugin_streambuf_map and we're done). When -// browser::new_stream is called, a plugin_streambuf matching that URL is -// gotten from the uninitialized_plugin_streambuf_map and -// plugin_streambuf::init is called on it. init removes the plugin_streambuf -// from the uninitialized_plugin_streambuf_map_ and inserts it in the -// plugin_streambuf_map with a plugin_streambuf::state of initialized. -// -// Step 3: Initialized plugin_streambuf (plugin_streambuf_map) -// -// The plugin_streambuf_map comprises plugin_streambufs that are being written -// to in response to browser::write calls and read from by stream readers in -// libopenvrml. Once the host is done calling browser::write for a stream, it -// is expected that it will call browser::destroy_stream. In response to this -// call, bounded_buffer<>::set_eof is called on the plugin_streambuf's -// underlying bounded_buffer<> and the plugin_streambuf is removed from the -// plugin_streambuf_map. -// -// Once the last reference to the resource_istream corresponding to the -// plugin_streambuf is removed, the plugin_streambuf is deleted. -// - -namespace { - - template <typename CharT, size_t BufferSize> - class bounded_buffer { - mutable boost::mutex mutex_; - boost::condition buffer_not_full_, buffer_not_empty_or_eof_; - - CharT buf_[BufferSize]; - size_t begin_, end_, buffered_; - bool eof_; - - public: - typedef CharT char_type; - typedef typename std::char_traits<char_type> traits_type; - typedef typename traits_type::int_type int_type; - - bounded_buffer(); - void put(const char_type & c); - int_type get(); - size_t buffered() const; - void set_eof(); - bool eof() const; - }; - - template <typename CharT, size_t BufferSize> - bounded_buffer<CharT, BufferSize>::bounded_buffer(): - begin_(0), - end_(0), - buffered_(0), - eof_(false) - {} - - template <typename CharT, size_t BufferSize> - void bounded_buffer<CharT, BufferSize>::put(const char_type & c) - { - boost::mutex::scoped_lock lock(this->mutex_); - while (this->buffered_ == BufferSize) { - this->buffer_not_full_.wait(lock); - } - this->buf_[this->end_] = c; - this->end_ = (this->end_ + 1) % BufferSize; - ++this->buffered_; - this->buffer_not_empty_or_eof_.notify_one(); - } - - template <typename CharT, size_t BufferSize> - typename bounded_buffer<CharT, BufferSize>::int_type - bounded_buffer<CharT, BufferSize>::get() - { - boost::mutex::scoped_lock lock(this->mutex_); - while (this->buffered_ == 0 && !this->eof_) { - this->buffer_not_empty_or_eof_.wait(lock); - } - if (this->buffered_ == 0 && this->eof_) { - return traits_type::eof(); - } - const int_type c = traits_type::to_int_type(this->buf_[this->begin_]); - this->begin_ = (this->begin_ + 1) % BufferSize; - --this->buffered_; - this->buffer_not_full_.notify_one(); - assert(!traits_type::eq_int_type(c, traits_type::eof())); - return c; - } - - template <typename CharT, size_t BufferSize> - size_t bounded_buffer<CharT, BufferSize>::buffered() const - { - boost::mutex::scoped_lock lock(this->mutex_); - return this->buffered_; - } - - template <typename CharT, size_t BufferSize> - void bounded_buffer<CharT, BufferSize>::set_eof() - { - boost::mutex::scoped_lock lock(this->mutex_); - this->eof_ = true; - this->buffer_not_empty_or_eof_.notify_one(); - } - - template <typename CharT, size_t BufferSize> - bool bounded_buffer<CharT, BufferSize>::eof() const - { - boost::mutex::scoped_lock lock(this->mutex_); - return this->eof_; - } -} - -class OPENVRML_LOCAL openvrml_control::browser::plugin_streambuf : - public boost::enable_shared_from_this< - openvrml_control::browser::plugin_streambuf>, - public std::streambuf { - - friend class openvrml_control::browser; - -public: - enum state_id { - requested, - uninitialized, - initialized - }; - -private: - state_id state_; - mutable boost::mutex mutex_; - int get_url_result_; - mutable boost::condition received_get_url_result_; - mutable boost::condition streambuf_initialized_or_failed_; - std::string url_; - std::string type_; - bounded_buffer<char_type, 16384> buf_; - int_type i_; - char_type c_; - uninitialized_plugin_streambuf_map & uninitialized_map_; - plugin_streambuf_map & map_; - -protected: - virtual int_type underflow(); - -public: - plugin_streambuf(const std::string & requested_url, - uninitialized_plugin_streambuf_map & uninitialized_map, - plugin_streambuf_map & map); - state_id state() const; - void set_get_url_result(int result); - void init(size_t stream_id, - const std::string & received_url, - const std::string & type); - void fail(); - const std::string & url() const; - const std::string & type() const; - bool data_available() const; -}; - -openvrml_control::browser::plugin_streambuf:: -plugin_streambuf(const std::string & requested_url, - uninitialized_plugin_streambuf_map & uninitialized_map, - plugin_streambuf_map & map): - state_(requested), - get_url_result_(-1), - url_(requested_url), - i_(0), - c_('\0'), - uninitialized_map_(uninitialized_map), - map_(map) -{ - // - // This is really just here to emphasize that c_ must not be EOF. - // - this->i_ = traits_type::not_eof(this->i_); - this->c_ = - traits_type::to_char_type( - traits_type::not_eof(traits_type::to_int_type(this->c_))); - - this->setg(&this->c_, &this->c_, &this->c_); -} - -openvrml_control::browser::plugin_streambuf::state_id -openvrml_control::browser::plugin_streambuf::state() const -{ - boost::mutex::scoped_lock lock(this->mutex_); - return this->state_; -} - -void -openvrml_control::browser::plugin_streambuf:: -set_get_url_result(const int result) -{ - boost::mutex::scoped_lock lock(this->mutex_); - assert(this->get_url_result_ == -1); - this->get_url_result_ = result; - - // - // If result is nonzero, the resource fetch failed early (i.e., before - // actually getting the stream. In that case, nothing else should be - // playing with this. Removing this streambuf from uninitialized_map_ - // below may (and probably will) result in destruction of this instance. - // - // So, anyone waiting on received_get_url_result_ should be doing so - // because the fetching code is trying to do something with this streambuf - // because the fetch is in-progress (i.e., succeeding). If you're waiting - // on this condition and result could possibly indicate failure, you're - // doing it wrong. - // - if (result == 0) { - this->state_ = plugin_streambuf::uninitialized; - this->received_get_url_result_.notify_all(); - } else { - this->uninitialized_map_.erase(*this); - } -} - -void -openvrml_control::browser::plugin_streambuf:: -init(const size_t stream_id, - const std::string & received_url, - const std::string & type) -{ - assert(stream_id); - assert(!received_url.empty()); - assert(!type.empty()); - - boost::mutex::scoped_lock lock(this->mutex_); - while (this->state_ != plugin_streambuf::uninitialized) { - this->received_get_url_result_.wait(lock); - } - - assert(this->state_ == uninitialized); - - bool succeeded = this->uninitialized_map_.erase(*this); - assert(succeeded); - this->url_ = received_url; - this->type_ = type; - this->state_ = plugin_streambuf::initialized; - const boost::shared_ptr<plugin_streambuf> this_ = shared_from_this(); - succeeded = this->map_.insert(stream_id, this_); - assert(succeeded); - this->streambuf_initialized_or_failed_.notify_all(); -} - -void openvrml_control::browser::plugin_streambuf::fail() -{ - boost::mutex::scoped_lock lock(this->mutex_); - const bool succeeded = this->uninitialized_map_.erase(*this); - assert(succeeded); - this->buf_.set_eof(); - this->streambuf_initialized_or_failed_.notify_all(); -} - -const std::string & openvrml_control::browser::plugin_streambuf::url() const -{ - boost::mutex::scoped_lock lock(this->mutex_); - while (this->state_ != plugin_streambuf::initialized) { - this->streambuf_initialized_or_failed_.wait(lock); - } - return this->url_; -} - -const std::string & openvrml_control::browser::plugin_streambuf::type() const -{ - boost::mutex::scoped_lock lock(this->mutex_); - while (this->state_ != plugin_streambuf::initialized) { - this->streambuf_initialized_or_failed_.wait(lock); - } - return this->type_; -} - -bool openvrml_control::browser::plugin_streambuf::data_available() const -{ - // - // It may seem a bit counterintuitive to return true here if the stream - // has been destroyed; however, if we don't return true in this case, - // clients may never get EOF from the stream. - // - return this->buf_.buffered() > 0 || this->buf_.eof(); -} - -openvrml_control::browser::plugin_streambuf::int_type -openvrml_control::browser::plugin_streambuf::underflow() -{ - boost::mutex::scoped_lock lock(this->mutex_); - while (this->state_ != plugin_streambuf::initialized) { - this->streambuf_initialized_or_failed_.wait(lock); - } - - if (traits_type::eq_int_type(this->i_, traits_type::eof())) { - return traits_type::eof(); - } - - this->i_ = this->buf_.get(); - this->c_ = traits_type::to_char_type(this->i_); - - if (traits_type::eq_int_type(this->i_, traits_type::eof())) { - return traits_type::eof(); - } - - this->setg(&this->c_, &this->c_, &this->c_ + 1); - return traits_type::to_int_type(*this->gptr()); -} - -const boost::shared_ptr<openvrml_control::browser::plugin_streambuf> -openvrml_control::browser::uninitialized_plugin_streambuf_map:: -find(const std::string & url) const -{ - using boost::shared_lock; - using boost::shared_mutex; - shared_lock<shared_mutex> lock(this->mutex_); - map_t::const_iterator pos = this->map_.find(url); - return pos == this->map_.end() - ? boost::shared_ptr<plugin_streambuf>() - : pos->second; -} - -void -openvrml_control::browser::uninitialized_plugin_streambuf_map:: -insert(const std::string & url, - const boost::shared_ptr<plugin_streambuf> & streambuf) -{ - using boost::unique_lock; - using boost::shared_mutex; - unique_lock<shared_mutex> lock(this->mutex_); - this->map_.insert(make_pair(url, streambuf)); -} - -struct OPENVRML_LOCAL openvrml_control::browser::uninitialized_plugin_streambuf_map::map_entry_matches_streambuf : - std::unary_function<bool, map_t::value_type> { - - explicit map_entry_matches_streambuf(const plugin_streambuf * streambuf): - streambuf_(streambuf) - {} - - bool operator()(const map_t::value_type & entry) const - { - return this->streambuf_ == entry.second.get(); - } - -private: - const plugin_streambuf * const streambuf_; -}; - -bool -openvrml_control::browser::uninitialized_plugin_streambuf_map:: -erase(const plugin_streambuf & streambuf) -{ - using boost::upgrade_lock; - using boost::upgrade_to_unique_lock; - using boost::shared_mutex; - upgrade_lock<shared_mutex> lock(this->mutex_); - const map_t::iterator pos = - std::find_if(this->map_.begin(), this->map_.end(), - map_entry_matches_streambuf(&streambuf)); - if (pos == this->map_.end()) { return false; } - upgrade_to_unique_lock<shared_mutex> upgraded_lock(lock); - this->map_.erase(pos); - return true; -} - -size_t -openvrml_control::browser::uninitialized_plugin_streambuf_map::size() const -{ - using boost::shared_lock; - using boost::shared_mutex; - shared_lock<shared_mutex> lock(this->mutex_); - return this->map_.size(); -} - -bool -openvrml_control::browser::uninitialized_plugin_streambuf_map::empty() const -{ - using boost::shared_lock; - using boost::shared_mutex; - shared_lock<shared_mutex> lock(this->mutex_); - return this->map_.empty(); -} - -const boost::shared_ptr<openvrml_control::browser::plugin_streambuf> -openvrml_control::browser::uninitialized_plugin_streambuf_map::front() const -{ - using boost::shared_lock; - using boost::shared_mutex; - shared_lock<shared_mutex> lock(this->mutex_); - assert(!this->map_.empty()); - return this->map_.begin()->second; -} - - -const boost::shared_ptr<openvrml_control::browser::plugin_streambuf> -openvrml_control::browser::plugin_streambuf_map::find(const size_t id) const -{ - using boost::shared_lock; - using boost::shared_mutex; - shared_lock<shared_mutex> lock(this->mutex_); - map_t::const_iterator pos = this->map_.find(id); - return pos == this->map_.end() - ? boost::shared_ptr<plugin_streambuf>() - : pos->second; -} - -bool -openvrml_control::browser::plugin_streambuf_map:: -insert(const size_t id, - const boost::shared_ptr<plugin_streambuf> & streambuf) -{ - using boost::unique_lock; - using boost::shared_mutex; - unique_lock<shared_mutex> lock(this->mutex_); - return this->map_.insert(make_pair(id, streambuf)).second; -} - -/** - * @brief Erase the entry corresponding to @p id. - * - * @return @c true if an entry was removed; @c false otherwise. - */ -bool openvrml_control::browser::plugin_streambuf_map::erase(const size_t id) -{ - using boost::unique_lock; - using boost::shared_mutex; - unique_lock<shared_mutex> lock(this->mutex_); - return this->map_.erase(id) > 0; -} - -openvrml_control::browser::resource_fetcher:: -resource_fetcher(browser_host & control_host, - uninitialized_plugin_streambuf_map & - uninitialized_plugin_streambuf_map, - plugin_streambuf_map & plugin_streambuf_map): - control_host_(control_host), - uninitialized_plugin_streambuf_map_(uninitialized_plugin_streambuf_map), - plugin_streambuf_map_(plugin_streambuf_map) -{} - -openvrml_control::browser::resource_fetcher::~resource_fetcher() - OPENVRML_NOTHROW -{ - this->thread_group_.join_all(); -} - -void -openvrml_control::browser::resource_fetcher:: -create_thread(const boost::function0<void> & threadfunc) -{ - this->thread_group_.create_thread(threadfunc); -} - -std::auto_ptr<openvrml::resource_istream> -openvrml_control::browser::resource_fetcher:: -do_get_resource(const std::string & uri) -{ - class plugin_resource_istream : public openvrml::resource_istream { - const boost::shared_ptr<plugin_streambuf> streambuf_; - resource_fetcher & resource_fetcher_; - - public: - plugin_resource_istream(const std::string & uri, - resource_fetcher & fetcher): - openvrml::resource_istream(0), - streambuf_( - new plugin_streambuf( - uri, - fetcher.uninitialized_plugin_streambuf_map_, - fetcher.plugin_streambuf_map_)), - resource_fetcher_(fetcher) - { - this->rdbuf(this->streambuf_.get()); - fetcher.uninitialized_plugin_streambuf_map_.insert( - uri, this->streambuf_); - - // - // browser_host::get_url could throw; let it. - // - const int get_url_result = fetcher.control_host_.get_url(uri); - - if (get_url_result != 0) { - this->setstate(ios_base::badbit); - } - this->streambuf_->set_get_url_result(get_url_result); - } - - private: - virtual const std::string do_url() const OPENVRML_NOTHROW - { - return this->streambuf_->url(); - } - - virtual const std::string do_type() const OPENVRML_NOTHROW - { - return this->streambuf_->type(); - } - - virtual bool do_data_available() const OPENVRML_NOTHROW - { - return this->streambuf_->data_available(); - } - }; - return std::auto_ptr<openvrml::resource_istream>( - new plugin_resource_istream(uri, *this)); -} - -openvrml_control::browser::browser_listener::browser_listener(browser & b): - browser_(b) -{} - -void -openvrml_control::browser::browser_listener:: -do_browser_changed(const openvrml::browser_event & event) -{ - switch (event.id()) { - case openvrml::browser_event::initialized: - { - boost::mutex::scoped_lock lock(this->browser_.initialized_mutex_); - this->browser_.initialized_ = true; - } - break; - default: - break; - } -} - -namespace { - // - // We don't already know what the URI of the initial stream is until we - // start getting that data from the browser. This is a placeholder that - // is used to identify the plugin_streambuf that will be used to receive - // the initial stream data. - // - const char initial_stream_uri[] = "x-openvrml-initial:"; - -} - -struct OPENVRML_LOCAL openvrml_control::browser::initial_stream_reader { - initial_stream_reader( - const boost::shared_ptr<plugin_streambuf> & streambuf, - openvrml::browser & browser): - streambuf_(streambuf), - browser_(browser) - {} - - void operator()() const throw () - { - class plugin_istream : public openvrml::resource_istream { - boost::shared_ptr<plugin_streambuf> streambuf_; - - public: - explicit plugin_istream( - const boost::shared_ptr<plugin_streambuf> & streambuf): - openvrml::resource_istream(streambuf.get()), - streambuf_(streambuf) - {} - - virtual ~plugin_istream() throw () - {} - - private: - virtual const std::string do_url() const throw (std::bad_alloc) - { - return this->streambuf_->url(); - } - - virtual const std::string do_type() const - throw (std::bad_alloc) - { - return this->streambuf_->type(); - } - - virtual bool do_data_available() const throw () - { - return this->streambuf_->data_available(); - } - } in(this->streambuf_); - - this->browser_.set_world(in); - } - -private: - boost::shared_ptr<plugin_streambuf> streambuf_; - openvrml::browser & browser_; -}; - -openvrml_control::browser::browser(browser_host & host, - const bool expect_initial_stream): - fetcher_(host, - this->uninitialized_streambuf_map_, - this->streambuf_map_), - listener_(*this), - browser_(this->fetcher_, std::cout, std::cerr), - host_(host), - expect_initial_stream_(expect_initial_stream), - got_initial_stream_(false) -{ - this->browser_.add_listener(this->listener_); - - // - // If necessary, create the initial stream. - // - if (expect_initial_stream) { - using boost::function0; - using boost::shared_ptr; - - const shared_ptr<plugin_streambuf> initial_stream( - new plugin_streambuf(::initial_stream_uri, - this->uninitialized_streambuf_map_, - this->streambuf_map_)); - initial_stream->state_ = plugin_streambuf::uninitialized; - this->uninitialized_streambuf_map_.insert(::initial_stream_uri, - initial_stream); - - const function0<void> initial_stream_reader_func = - initial_stream_reader(initial_stream, this->browser_); - - this->initial_stream_reader_thread_.reset( - new boost::thread(initial_stream_reader_func)); - } -} - -openvrml_control::browser::~browser() OPENVRML_NOTHROW -{ - if (this->expect_initial_stream_) { - this->initial_stream_reader_thread_->join(); - } - this->browser_.remove_listener(this->listener_); -} - -bool openvrml_control::browser::initialized() const -{ - boost::mutex::scoped_lock lock(this->initialized_mutex_); - return this->initialized_; -} - -void openvrml_control::browser::new_stream(const uint64_t stream_id, - const std::string & type, - const std::string & uri) - OPENVRML_THROW1(unknown_stream) -{ - assert(!type.empty()); - assert(!uri.empty()); - - using boost::shared_ptr; - - shared_ptr<plugin_streambuf> streambuf = - this->uninitialized_streambuf_map_.find(uri); - - if (!streambuf) { - if (!this->got_initial_stream_) { - assert(this->uninitialized_streambuf_map_.size() == 1); - streambuf = this->uninitialized_streambuf_map_.front(); - this->got_initial_stream_ = true; - } else { - throw unknown_stream(uri); - } - } - assert(streambuf->state() != plugin_streambuf::initialized); - streambuf->init(stream_id, uri, type); -} - -void openvrml_control::browser::destroy_stream(const uint64_t stream_id) - OPENVRML_THROW1(unknown_stream) -{ - using boost::shared_ptr; - - const shared_ptr<plugin_streambuf> streambuf = - this->streambuf_map_.find(stream_id); - if (!streambuf) { throw unknown_stream(stream_id); } - streambuf->buf_.set_eof(); - this->streambuf_map_.erase(stream_id); -} - -void openvrml_control::browser::write(const uint64_t stream_id, - const unsigned char * const data, - const size_t size) - OPENVRML_THROW1(unknown_stream) -{ - using boost::shared_ptr; - - const shared_ptr<plugin_streambuf> streambuf = - this->streambuf_map_.find(stream_id); - if (!streambuf) { throw unknown_stream(stream_id); } - for (size_t i = 0; i < size; ++i) { streambuf->buf_.put(data[i]); } -} - -struct OPENVRML_LOCAL openvrml_control::browser::load_url { - load_url(browser & b, - const std::vector<std::string> & url, - const std::vector<std::string> & parameter): - browser_(b), - url_(url), - parameter_(parameter) - {} - - void operator()() const OPENVRML_NOTHROW - { - try { - { - boost::mutex::scoped_lock - lock(this->browser_.initialized_mutex_); - this->browser_.initialized_ = false; - } - this->browser_.browser_.load_url(this->url_, this->parameter_); - } catch (std::exception & ex) { - this->browser_.browser_.err(ex.what()); - } - } - - private: - browser & browser_; - const std::vector<std::string> url_, parameter_; -}; - -void -openvrml_control::browser::load_uri(const std::vector<std::string> & uri, - const std::vector<std::string> & parameter) - OPENVRML_THROW2(boost::thread_resource_error, std::bad_alloc) -{ - this->fetcher_.create_thread(load_url(*this, uri, parameter)); -} - -const std::string openvrml_control::browser::world_url() -{ - return this->browser_.world_url(); -} - -bool -openvrml_control::browser::add_listener(openvrml::browser_listener & listener) -{ - return this->browser_.add_listener(listener); -} - -bool -openvrml_control::browser:: -remove_listener(openvrml::browser_listener & listener) -{ - return this->browser_.remove_listener(listener); -} - -void openvrml_control::browser::viewer(openvrml::viewer * v) -{ - this->browser_.viewer(v); -} - -openvrml_control::browser_host::~browser_host() -{} - -int openvrml_control::browser_host::get_url(const std::string & url) -{ - return this->do_get_url(url); -} Copied: branches/0.18/src/local/libopenvrml-control/openvrml_control/browser.cpp (from rev 3976, trunk/src/local/libopenvrml-control/openvrml_control/browser.cpp) =================================================================== --- branches/0.18/src/local/libopenvrml-control/openvrml_control/browser.cpp (rev 0) +++ branches/0.18/src/local/libopenvrml-control/openvrml_control/browser.cpp 2009-08-02 04:38:31 UTC (rev 3978) @@ -0,0 +1,806 @@ +// -*- mode: c++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*- +// +// OpenVRML Control +// +// Copyright 2009 Braden N. McDaniel +// +// This program 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; either version 3 of the License, or (at your option) +// any later version. +// +// This program 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; if not, see <http://www.gnu.org/licenses/>. +// + +# include "browser.h" +# include <boost/enable_shared_from_this.hpp> +# include <boost/lexical_cast.hpp> +# include <boost/thread/condition.hpp> +# include <iostream> + +openvrml_control::unknown_stream::unknown_stream(const std::string & uri): + std::logic_error("no stream corresponding to URI: " + uri) +{} + +openvrml_control::unknown_stream::unknown_stream(const uint64_t stream_id): + std::logic_error("no stream corresponding to stream ID: " + + boost::lexical_cast<std::string>(stream_id)) +{} + +openvrml_control::unknown_stream::~unknown_stream() throw () +{} + +// +// plugin_streambuf Life Cycle +// +// A plugin_streambuf is first created in +// browser::resource_fetcher::do_get_resource (which is called whenever +// libopenvrml needs to load a stream). +// +// Step 1: Requested plugin_streambuf +// +// Upon creation, the plugin_streambuf is inserted into the +// unintialized_plugin_streambuf_map with an initial plugin_streambuf::state +// of requested. do_get_resource does not complete until the result of asking +// the host application to resolve the URL is known; i.e., +// plugin_streambuf::get_url_result. get_url_result blocks until the response +// is received from the host application; i.e., until +// plugin_streambuf::set_get_url_result has been called. +// +// Step 2: Uninitialized plugin_streambuf +// +// If plugin_streambuf::set_get_url_result is given a result code indicating +// success (i.e., 0), the plugin_streambuf::state is changed to uninitialized +// (otherwise, the stream is removed from the +// uninitialized_plugin_streambuf_map and we're done). When +// browser::new_stream is called, a plugin_streambuf matching that URL is +// gotten from the uninitialized_plugin_streambuf_map and +// plugin_streambuf::init is called on it. init removes the plugin_streambuf +// from the uninitialized_plugin_streambuf_map_ and inserts it in the +// plugin_streambuf_map with a plugin_streambuf::state of initialized. +// +// Step 3: Initialized plugin_streambuf (plugin_streambuf_map) +// +// The plugin_streambuf_map comprises plugin_streambufs that are being written +// to in response to browser::write calls and read from by stream readers in +// libopenvrml. Once the host is done calling browser::write for a stream, it +// is expected that it will call browser::destroy_stream. In response to this +// call, bounded_buffer<>::set_eof is called on the plugin_streambuf's +// underlying bounded_buffer<> and the plugin_streambuf is removed from the +// plugin_streambuf_map. +// +// Once the last reference to the resource_istream corresponding to the +// plugin_streambuf is removed, the plugin_streambuf is deleted. +// + +namespace { + + template <typename CharT, size_t BufferSize> + class bounded_buffer { + mutable boost::mutex mutex_; + boost::condition buffer_not_full_, buffer_not_empty_or_eof_; + + CharT buf_[BufferSize]; + size_t begin_, end_, buffered_; + bool eof_; + + public: + typedef CharT char_type; + typedef typename std::char_traits<char_type> traits_type; + typedef typename traits_type::int_type int_type; + + bounded_buffer(); + void put(const char_type & c); + int_type get(); + size_t buffered() const; + void set_eof(); + bool eof() const; + }; + + template <typename CharT, size_t BufferSize> + bounded_buffer<CharT, BufferSize>::bounded_buffer(): + begin_(0), + end_(0), + buffered_(0), + eof_(false) + {} + + template <typename CharT, size_t BufferSize> + void bounded_buffer<CharT, BufferSize>::put(const char_type & c) + { + boost::mutex::scoped_lock lock(this->mutex_); + while (this->buffered_ == BufferSize) { + this->buffer_not_full_.wait(lock); + } + this->buf_[this->end_] = c; + this->end_ = (this->end_ + 1) % BufferSize; + ++this->buffered_; + this->buffer_not_empty_or_eof_.notify_one(); + } + + template <typename CharT, size_t BufferSize> + typename bounded_buffer<CharT, BufferSize>::int_type + bounded_buffer<CharT, BufferSize>::get() + { + boost::mutex::scoped_lock lock(this->mutex_); + while (this->buffered_ == 0 && !this->eof_) { + this->buffer_not_empty_or_eof_.wait(lock); + } + if (this->buffered_ == 0 && this->eof_) { + return traits_type::eof(); + } + const int_type c = traits_type::to_int_type(this->buf_[this->begin_]); + this->begin_ = (this->begin_ + 1) % BufferSize; + --this->buffered_; + this->buffer_not_full_.notify_one(); + assert(!traits_type::eq_int_type(c, traits_type::eof())); + return c; + } + + template <typename CharT, size_t BufferSize> + size_t bounded_buffer<CharT, BufferSize>::buffered() const + { + boost::mutex::scoped_lock lock(this->mutex_); + return this->buffered_; + } + + template <typename CharT, size_t BufferSize> + void bounded_buffer<CharT, BufferSize>::set_eof() + { + boost::mutex::scoped_lock lock(this->mutex_); + this->eof_ = true; + this->buffer_not_empty_or_eof_.notify_one(); + } + + template <typename CharT, size_t BufferSize> + bool bounded_buffer<CharT, BufferSize>::eof() const + { + boost::mutex::scoped_lock lock(this->mutex_); + return this->eof_; + } +} + +class OPENVRML_LOCAL openvrml_control::browser::plugin_streambuf : + public boost::enable_shared_from_this< + openvrml_control::browser::plugin_streambuf>, + public std::streambuf { + + friend class openvrml_control::browser; + +public: + enum state_id { + requested, + uninitialized, + initialized + }; + +private: + state_id state_; + mutable boost::mutex mutex_; + int get_url_result_; + mutable boost::condition received_get_url_result_; + mutable boost::condition streambuf_initialized_or_failed_; + std::string url_; + std::string type_; + bounded_buffer<char_type, 16384> buf_; + int_type i_; + char_type c_; + uninitialized_plugin_streambuf_map & uninitialized_map_; + plugin_streambuf_map & map_; + +protected: + virtual int_type underflow(); + +public: + plugin_streambuf(const std::string & requested_url, + uninitialized_plugin_streambuf_map & uninitialized_map, + plugin_streambuf_map & map); + state_id state() const; + void set_get_url_result(int result); + void init(size_t stream_id, + const std::string & received_url, + const std::string & type); + void fail(); + const std::string & url() const; + const std::string & type() const; + bool data_available() const; +}; + +openvrml_control::browser::plugin_streambuf:: +plugin_streambuf(const std::string & requested_url, + uninitialized_plugin_streambuf_map & uninitialized_map, + plugin_streambuf_map & map): + state_(requested), + get_url_result_(-1), + url_(requested_url), + i_(0), + c_('\0'), + uninitialized_map_(uninitialized_map), + map_(map) +{ + // + // This is really just here to emphasize that c_ must not be EOF. + // + this->i_ = traits_type::not_eof(this->i_); + this->c_ = + traits_type::to_char_type( + traits_type::not_eof(traits_type::to_int_type(this->c_))); + + this->setg(&this->c_, &this->c_, &this->c_); +} + +openvrml_control::browser::plugin_streambuf::state_id +openvrml_control::browser::plugin_streambuf::state() const +{ + boost::mutex::scoped_lock lock(this->mutex_); + return this->state_; +} + +void +openvrml_control::browser::plugin_streambuf:: +set_get_url_result(const int result) +{ + boost::mutex::scoped_lock lock(this->mutex_); + assert(this->get_url_result_ == -1); + this->get_url_result_ = result; + + // + // If result is nonzero, the resource fetch failed early (i.e., before + // actually getting the stream. In that case, nothing else should be + // playing with this. Removing this streambuf from uninitialized_map_ + // below may (and probably will) result in destruction of this instance. + // + // So, anyone waiting on received_get_url_result_ should be doing so + // because the fetching code is trying to do something with this streambuf + // because the fetch is in-progress (i.e., succeeding). If you're waiting + // on this condition and result could possibly indicate failure, you're + // doing it wrong. + // + if (result == 0) { + this->state_ = plugin_streambuf::uninitialized; + this->received_get_url_result_.notify_all(); + } else { + this->uninitialized_map_.erase(*this); + } +} + +void +openvrml_control::browser::plugin_streambuf:: +init(const size_t stream_id, + const std::string & received_url, + const std::string & type) +{ + assert(stream_id); + assert(!received_url.empty()); + assert(!type.empty()); + + boost::mutex::scoped_lock lock(this->mutex_); + while (this->state_ != plugin_streambuf::uninitialized) { + this->received_get_url_result_.wait(lock); + } + + assert(this->state_ == uninitialized); + + bool succeeded = this->uninitialized_map_.erase(*this); + assert(succeeded); + this->url_ = received_url; + this->type_ = type; + this->state_ = plugin_streambuf::initialized; + const boost::shared_ptr<plugin_streambuf> this_ = shared_from_this(); + succeeded = this->map_.insert(stream_id, this_); + assert(succeeded); + this->streambuf_initialized_or_failed_.notify_all(); +} + +void openvrml_control::browser::plugin_streambuf::fail() +{ + boost::mutex::scoped_lock lock(this->mutex_); + const bool succeeded = this->uninitialized_map_.erase(*this); + assert(succeeded); + this->buf_.set_eof(); + this->streambuf_initialized_or_failed_.notify_all(); +} + +const std::string & openvrml_control::browser::plugin_streambuf::url() const +{ + boost::mutex::scoped_lock lock(this->mutex_); + while (this->state_ != plugin_streambuf::initialized) { + this->streambuf_initialized_or_failed_.wait(lock); + } + return this->url_; +} + +const std::string & openvrml_control::browser::plugin_streambuf::type() const +{ + boost::mutex::scoped_lock lock(this->mutex_); + while (this->state_ != plugin_streambuf::initialized) { + this->streambuf_initialized_or_failed_.wait(lock); + } + return this->type_; +} + +bool openvrml_control::browser::plugin_streambuf::data_available() const +{ + // + // It may seem a bit counterintuitive to return true here if the stream + // has been destroyed; however, if we don't return true in this case, + // clients may never get EOF from the stream. + // + return this->buf_.buffered() > 0 || this->buf_.eof(); +} + +openvrml_control::browser::plugin_streambuf::int_type +openvrml_control::browser::plugin_streambuf::underflow() +{ + boost::mutex::scoped_lock lock(this->mutex_); + while (this->state_ != plugin_streambuf::initialized) { + this->streambuf_initialized_or_failed_.wait(lock); + } + + if (traits_type::eq_int_type(this->i_, traits_typ... [truncated message content] |
From: <br...@us...> - 2009-08-02 04:49:25
|
Revision: 3980 http://openvrml.svn.sourceforge.net/openvrml/?rev=3980&view=rev Author: braden Date: 2009-08-02 04:49:17 +0000 (Sun, 02 Aug 2009) Log Message: ----------- Moved libltdl/LoadLibrary wrapper to its own convenience library. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/src/Makefile.am Added Paths: ----------- branches/0.18/src/local/libopenvrml-dl/ branches/0.18/src/local/libopenvrml-dl/openvrml/ branches/0.18/src/local/libopenvrml-dl/openvrml/local/ branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.h Removed Paths: ------------- branches/0.18/src/libopenvrml/openvrml/local/dl.cpp branches/0.18/src/libopenvrml/openvrml/local/dl.h branches/0.18/src/local/libopenvrml-dl/openvrml/ branches/0.18/src/local/libopenvrml-dl/openvrml/local/ branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.h Property Changed: ---------------- branches/0.18/ branches/0.18/src/libopenvrml/openvrml/bad_url.cpp branches/0.18/src/libopenvrml/openvrml/bad_url.h branches/0.18/src/libopenvrml/openvrml/local/proto.cpp branches/0.18/src/libopenvrml/openvrml/local/proto.h branches/0.18/src/libopenvrml/openvrml/scene.cpp branches/0.18/src/libopenvrml/openvrml/scene.h branches/0.18/src/libopenvrml/openvrml/script.cpp branches/0.18/src/mozilla-plugin/ branches/0.18/src/node/vrml97/register_node_metatypes.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.h branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp branches/0.18/src/node/x3d-core/metadata_double.cpp branches/0.18/src/node/x3d-core/metadata_double.h branches/0.18/src/node/x3d-core/metadata_float.cpp branches/0.18/src/node/x3d-core/metadata_float.h branches/0.18/src/node/x3d-core/metadata_integer.cpp branches/0.18/src/node/x3d-core/metadata_integer.h branches/0.18/src/node/x3d-core/metadata_set.cpp branches/0.18/src/node/x3d-core/metadata_set.h branches/0.18/src/node/x3d-core/metadata_string.cpp branches/0.18/src/node/x3d-core/metadata_string.h branches/0.18/src/node/x3d-core/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/espdu_transform.cpp branches/0.18/src/node/x3d-dis/espdu_transform.h branches/0.18/src/node/x3d-dis/receiver_pdu.cpp branches/0.18/src/node/x3d-dis/receiver_pdu.h branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/signal_pdu.cpp branches/0.18/src/node/x3d-dis/signal_pdu.h branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp branches/0.18/src/node/x3d-dis/transmitter_pdu.h branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.h branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp branches/0.18/src/node/x3d-event-utilities/boolean_filter.h branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp branches/0.18/src/node/x3d-event-utilities/integer_trigger.h branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.h branches/0.18/src/node/x3d-geometry2d/arc2d.cpp branches/0.18/src/node/x3d-geometry2d/arc2d.h branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp branches/0.18/src/node/x3d-geometry2d/arc_close2d.h branches/0.18/src/node/x3d-geometry2d/circle2d.cpp branches/0.18/src/node/x3d-geometry2d/circle2d.h branches/0.18/src/node/x3d-geometry2d/disk2d.cpp branches/0.18/src/node/x3d-geometry2d/disk2d.h branches/0.18/src/node/x3d-geometry2d/polyline2d.cpp branches/0.18/src/node/x3d-geometry2d/polyline2d.h branches/0.18/src/node/x3d-geometry2d/polypoint2d.cpp branches/0.18/src/node/x3d-geometry2d/polypoint2d.h branches/0.18/src/node/x3d-geometry2d/rectangle2d.cpp branches/0.18/src/node/x3d-geometry2d/rectangle2d.h branches/0.18/src/node/x3d-geometry2d/register_node_metatypes.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.h branches/0.18/src/node/x3d-geospatial/geo_coordinate.cpp branches/0.18/src/node/x3d-geospatial/geo_coordinate.h branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.cpp branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.h branches/0.18/src/node/x3d-geospatial/geo_location.cpp branches/0.18/src/node/x3d-geospatial/geo_location.h branches/0.18/src/node/x3d-geospatial/geo_lod.cpp branches/0.18/src/node/x3d-geospatial/geo_lod.h branches/0.18/src/node/x3d-geospatial/geo_metadata.cpp branches/0.18/src/node/x3d-geospatial/geo_metadata.h branches/0.18/src/node/x3d-geospatial/geo_origin.cpp branches/0.18/src/node/x3d-geospatial/geo_origin.h branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.cpp branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.h branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.cpp branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.h branches/0.18/src/node/x3d-geospatial/geo_viewpoint.cpp branches/0.18/src/node/x3d-geospatial/geo_viewpoint.h branches/0.18/src/node/x3d-geospatial/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/static_group.cpp branches/0.18/src/node/x3d-grouping/static_group.h branches/0.18/src/node/x3d-h-anim/h_anim_displacer.cpp branches/0.18/src/node/x3d-h-anim/h_anim_displacer.h branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.cpp branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.h branches/0.18/src/node/x3d-h-anim/h_anim_joint.cpp branches/0.18/src/node/x3d-h-anim/h_anim_joint.h branches/0.18/src/node/x3d-h-anim/h_anim_segment.cpp branches/0.18/src/node/x3d-h-anim/h_anim_segment.h branches/0.18/src/node/x3d-h-anim/h_anim_site.cpp branches/0.18/src/node/x3d-h-anim/h_anim_site.h branches/0.18/src/node/x3d-h-anim/register_node_metatypes.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.h branches/0.18/src/node/x3d-interpolation/position_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/position_interpolator2d.h branches/0.18/src/node/x3d-interpolation/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.h branches/0.18/src/node/x3d-key-device-sensor/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.h branches/0.18/src/node/x3d-networking/load_sensor.cpp branches/0.18/src/node/x3d-networking/load_sensor.h branches/0.18/src/node/x3d-networking/register_node_metatypes.cpp branches/0.18/src/node/x3d-nurbs/contour2d.cpp branches/0.18/src/node/x3d-nurbs/contour2d.h branches/0.18/src/node/x3d-nurbs/contour_polyline2d.cpp branches/0.18/src/node/x3d-nurbs/contour_polyline2d.h branches/0.18/src/node/x3d-nurbs/coordinate_double.cpp branches/0.18/src/node/x3d-nurbs/coordinate_double.h branches/0.18/src/node/x3d-nurbs/nurbs_curve.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve.h branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.h branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_set.cpp branches/0.18/src/node/x3d-nurbs/nurbs_set.h branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.h branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.h branches/0.18/src/node/x3d-nurbs/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/color_rgba.cpp branches/0.18/src/node/x3d-rendering/color_rgba.h branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.h branches/0.18/src/node/x3d-rendering/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.h branches/0.18/src/node/x3d-rendering/triangle_set.cpp branches/0.18/src/node/x3d-rendering/triangle_set.h branches/0.18/src/node/x3d-rendering/triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/triangle_strip_set.h branches/0.18/src/node/x3d-shape/fill_properties.cpp branches/0.18/src/node/x3d-shape/fill_properties.h branches/0.18/src/node/x3d-shape/line_properties.cpp branches/0.18/src/node/x3d-shape/line_properties.h branches/0.18/src/node/x3d-shape/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/multi_texture.cpp branches/0.18/src/node/x3d-texturing/multi_texture.h branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.cpp branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.h branches/0.18/src/node/x3d-texturing/multi_texture_transform.cpp branches/0.18/src/node/x3d-texturing/multi_texture_transform.h branches/0.18/src/node/x3d-texturing/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.h Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2009-08-02 04:45:09 UTC (rev 3979) +++ branches/0.18/ChangeLog 2009-08-02 04:49:17 UTC (rev 3980) @@ -1,3 +1,24 @@ +2009-08-02 Braden McDaniel <br...@en...> + + Moved libltdl/LoadLibrary wrapper to its own convenience library. + + * src/Makefile.am + (noinst_LTLIBRARIES): Added local/libopenvrml-dl.la. + (libopenvrml_libopenvrml_la_CPPFLAGS): Add libopenvrml-dl source + directory to the include path. + (libopenvrml_libopenvrml_la_SOURCES): Removed + libopenvrml/openvrml/local/dl.{cpp,h}. + (libopenvrml_libopenvrml_la_LIBADD): Added libopenvrml-dl.la; + removed -lltdl. + (local_libopenvrml_dl_la_SOURCES): Added. + (local_libopenvrml_dl_la_CPPFLAGS): Add libopenvrml build source + directories to the include path. + (local_libopenvrml_dl_la_LIBADD): Link with libltdl. + * src/libopenvrml/openvrml/local/dl.cpp: Removed. + * src/libopenvrml/openvrml/local/dl.h: Removed. + * src/local/libopenvrml-dl/openvrml/local/dl.cpp: Added. + * src/local/libopenvrml-dl/openvrml/local/dl.h: Added. + 2009-08-01 Braden McDaniel <br...@en...> Moved src/libopenvrml-control to src/local/libopenvrml-control. Modified: branches/0.18/src/Makefile.am =================================================================== --- branches/0.18/src/Makefile.am 2009-08-02 04:45:09 UTC (rev 3979) +++ branches/0.18/src/Makefile.am 2009-08-02 04:49:17 UTC (rev 3980) @@ -6,6 +6,7 @@ if ENABLE_GL_RENDERER lib_LTLIBRARIES += libopenvrml-gl/libopenvrml-gl.la endif +noinst_LTLIBRARIES = local/libopenvrml-dl.la pkginclude_HEADERS = \ libopenvrml/openvrml-config.h \ @@ -64,6 +65,7 @@ libopenvrml_libopenvrml_la_CPPFLAGS = \ -I$(top_builddir)/src/libopenvrml \ -I$(top_srcdir)/src/libopenvrml \ + -I$(top_srcdir)/src/local/libopenvrml-dl \ -I$(srcdir)/node \ -I$(srcdir)/node/vrml97 \ -DOPENVRML_LIBDIR_=\"$(libdir)\" \ @@ -96,8 +98,6 @@ libopenvrml/openvrml/node_impl_util.cpp \ libopenvrml/openvrml/local/conf.cpp \ libopenvrml/openvrml/local/conf.h \ - libopenvrml/openvrml/local/dl.cpp \ - libopenvrml/openvrml/local/dl.h \ libopenvrml/openvrml/local/uri.cpp \ libopenvrml/openvrml/local/uri.h \ libopenvrml/openvrml/local/xml_reader.cpp \ @@ -122,10 +122,18 @@ $(PTHREAD_LIBS) libopenvrml_libopenvrml_la_LIBADD = \ + local/libopenvrml-dl.la \ -lboost_thread$(BOOST_LIB_SUFFIX) \ - -lboost_filesystem$(BOOST_LIB_SUFFIX) \ - -lltdl + -lboost_filesystem$(BOOST_LIB_SUFFIX) +local_libopenvrml_dl_la_SOURCES = \ + local/libopenvrml-dl/openvrml/local/dl.cpp \ + local/libopenvrml-dl/openvrml/local/dl.h +local_libopenvrml_dl_la_CPPFLAGS = \ + -I$(top_builddir)/src/libopenvrml \ + -I$(top_srcdir)/src/libopenvrml +local_libopenvrml_dl_la_LIBADD = -lltdl + openvrmlscriptdir = $(pkglibdir)/script openvrmlscript_LTLIBRARIES = @@ -719,7 +727,7 @@ libopenvrml_gl_libopenvrml_gl_la_LIBADD = libopenvrml/libopenvrml.la if ENABLE_XEMBED -noinst_LTLIBRARIES = local/libopenvrml-control.la +noinst_LTLIBRARIES += local/libopenvrml-control.la libexec_PROGRAMS = openvrml-xembed/openvrml-xembed session_bus_servicesdir = $(datadir)/dbus-1/services session_bus_services_DATA = openvrml-xembed/org.openvrml.BrowserControl.service Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976 + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976 + /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979 Deleted: branches/0.18/src/libopenvrml/openvrml/local/dl.cpp =================================================================== --- branches/0.18/src/libopenvrml/openvrml/local/dl.cpp 2009-08-02 04:45:09 UTC (rev 3979) +++ branches/0.18/src/libopenvrml/openvrml/local/dl.cpp 2009-08-02 04:49:17 UTC (rev 3980) @@ -1,172 +0,0 @@ -// -*- mode: c++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*- -// -// OpenVRML -// -// Copyright 2008 Braden McDaniel -// -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Lesser General Public License as published by -// the Free Software Foundation; either version 3 of the License, or (at your -// option) any later version. -// -// This library 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 Lesser General Public -// License for more details. -// -// You should have received a copy of the GNU Lesser General Public License -// along with this library; if not, see <http://www.gnu.org/licenses/>. -// - -# include "dl.h" -# include <boost/filesystem.hpp> -# include <boost/ref.hpp> -# include <boost/tokenizer.hpp> -# include <boost/multi_index/detail/scope_guard.hpp> - -using namespace boost::multi_index::detail; // for scope_guard - -int openvrml::local::dl::init() -{ -# ifdef _WIN32 - return 0; -# else - return lt_dlinit(); -# endif -} - -int openvrml::local::dl::exit() -{ -# ifdef _WIN32 - return 0; -# else - return lt_dlexit(); -# endif -} - -namespace { - - struct OPENVRML_LOCAL win32_search_path_tokenizer { - win32_search_path_tokenizer() - {} - - template <typename Iterator, typename Token> - bool operator()(Iterator & next, Iterator end, Token & tok) - { - while (next != end) { - if (*next == ';') { - ++next; - break; - } - this->tok_.push_back(*next); - ++next; - } - if (!this->tok_.empty()) { - tok = this->tok_; - this->tok_.clear(); - return true; - } - return false; - } - - void reset() - { - this->tok_.clear(); - } - - private: - std::string tok_; - }; -} - -int -openvrml::local::dl::foreachfile(const char * search_path, - int (*func)(const char * filename, void * data), - void * data) -{ -# ifdef _WIN32 - using boost::filesystem::path; - using boost::filesystem::directory_iterator; - typedef boost::tokenizer<win32_search_path_tokenizer> tokenizer_t; - - std::vector<path> search_dirs; - win32_search_path_tokenizer tokenizer_func; - std::string search_path_str(search_path); - tokenizer_t tokenizer(search_path_str, tokenizer_func); - for (tokenizer_t::const_iterator token = tokenizer.begin(); - token != tokenizer.end(); - ++token) { - search_dirs.push_back(path(*token)); - } - - int result = 0; - for (std::vector<path>::const_iterator dir = search_dirs.begin(); - dir != search_dirs.end(); - ++dir) try { - for (directory_iterator entry(*dir); - entry != directory_iterator(); - ++entry) { - result = (func)(entry->path().external_file_string().c_str(), - data); - if (result != 0) { return result; } - } - } catch (boost::filesystem::filesystem_error &) {} - return result; -# else - return lt_dlforeachfile(search_path, func, data); -# endif -} - -openvrml::local::dl::handle openvrml::local::dl::open(const char * filename) -{ -# ifdef _WIN32 - const char * last_dot = strrchr(filename, '.'); - if (strcmp(last_dot, ".dll") != 0) { return 0; } - return LoadLibrary(filename); -# else - return lt_dlopenext(filename); -# endif -} - -const std::string openvrml::local::dl::error() -{ -# ifdef _WIN32 - const DWORD err = GetLastError(); - char * buf = 0; - scope_guard buf_guard = make_guard(LocalFree, boost::ref(buf)); - static const LPCVOID source = 0; - static const DWORD buf_size = 0; - static va_list * const args = 0; - const DWORD buf_chars = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER - | FORMAT_MESSAGE_FROM_SYSTEM, - source, - err, - LANG_USER_DEFAULT, - reinterpret_cast<LPSTR>(&buf), - buf_size, - args); - assert(buf_chars != 0); // If FormatMessage failed, just give up. - const std::string buf_str(buf ? buf : ""); - return buf_str; -# else - return lt_dlerror(); -# endif -} - -int openvrml::local::dl::close(handle h) -{ -# ifdef _WIN32 - return FreeLibrary(h); -# else - return lt_dlclose(h); -# endif -} - -void * openvrml::local::dl::sym(handle h, const char * name) -{ -# ifdef _WIN32 - return GetProcAddress(h, name); -# else - return lt_dlsym(h, name); -# endif -} Deleted: branches/0.18/src/libopenvrml/openvrml/local/dl.h =================================================================== --- branches/0.18/src/libopenvrml/openvrml/local/dl.h 2009-08-02 04:45:09 UTC (rev 3979) +++ branches/0.18/src/libopenvrml/openvrml/local/dl.h 2009-08-02 04:49:17 UTC (rev 3980) @@ -1,64 +0,0 @@ -// -*- mode: c++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*- -// -// OpenVRML -// -// Copyright 2008 Braden McDaniel -// -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Lesser General Public License as published by -// the Free Software Foundation; either version 3 of the License, or (at your -// option) any later version. -// -// This library 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 Lesser General Public -// License for more details. -// -// You should have received a copy of the GNU Lesser General Public License -// along with this library; if not, see <http://www.gnu.org/licenses/>. -// - -# ifndef OPENVRML_LOCAL_DL_H -# define OPENVRML_LOCAL_DL_H - -# include <openvrml-common.h> -# ifdef _WIN32 -# include <windows.h> -# else -# include <ltdl.h> -# endif -# include <string> - -namespace openvrml { - - namespace local { - - namespace dl { - - OPENVRML_LOCAL int init(); - - OPENVRML_LOCAL int exit(); - - OPENVRML_LOCAL - int foreachfile(const char * search_path, - int (*func)(const char * filename, void * data), - void * data); - -# ifdef _WIN32 - typedef HMODULE handle; -# else - typedef lt_dlhandle handle; -# endif - - OPENVRML_LOCAL handle open(const char * filename); - - OPENVRML_LOCAL const std::string error(); - - OPENVRML_LOCAL int close(handle); - - OPENVRML_LOCAL void * sym(handle, const char * name); - } - } -} - -# endif // ifndef OPENVRML_LOCAL_DL_H Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976 + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976 + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979 Property changes on: branches/0.18/src/libopenvrml/openvrml/script.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976 + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 Deleted: branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp =================================================================== --- trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp 2009-08-02 04:45:09 UTC (rev 3979) +++ branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp 2009-08-02 04:49:17 UTC (rev 3980) @@ -1,172 +0,0 @@ -// -*- mode: c++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*- -// -// OpenVRML -// -// Copyright 2008 Braden McDaniel -// -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Lesser General Public License as published by -// the Free Software Foundation; either version 3 of the License, or (at your -// option) any later version. -// -// This library 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 Lesser General Public -// License for more details. -// -// You should have received a copy of the GNU Lesser General Public License -// along with this library; if not, see <http://www.gnu.org/licenses/>. -// - -# include "dl.h" -# include <boost/filesystem.hpp> -# include <boost/ref.hpp> -# include <boost/tokenizer.hpp> -# include <boost/multi_index/detail/scope_guard.hpp> - -using namespace boost::multi_index::detail; // for scope_guard - -int openvrml::local::dl::init() -{ -# ifdef _WIN32 - return 0; -# else - return lt_dlinit(); -# endif -} - -int openvrml::local::dl::exit() -{ -# ifdef _WIN32 - return 0; -# else - return lt_dlexit(); -# endif -} - -namespace { - - struct OPENVRML_LOCAL win32_search_path_tokenizer { - win32_search_path_tokenizer() - {} - - template <typename Iterator, typename Token> - bool operator()(Iterator & next, Iterator end, Token & tok) - { - while (next != end) { - if (*next == ';') { - ++next; - break; - } - this->tok_.push_back(*next); - ++next; - } - if (!this->tok_.empty()) { - tok = this->tok_; - this->tok_.clear(); - return true; - } - return false; - } - - void reset() - { - this->tok_.clear(); - } - - private: - std::string tok_; - }; -} - -int -openvrml::local::dl::foreachfile(const char * search_path, - int (*func)(const char * filename, void * data), - void * data) -{ -# ifdef _WIN32 - using boost::filesystem::path; - using boost::filesystem::directory_iterator; - typedef boost::tokenizer<win32_search_path_tokenizer> tokenizer_t; - - std::vector<path> search_dirs; - win32_search_path_tokenizer tokenizer_func; - std::string search_path_str(search_path); - tokenizer_t tokenizer(search_path_str, tokenizer_func); - for (tokenizer_t::const_iterator token = tokenizer.begin(); - token != tokenizer.end(); - ++token) { - search_dirs.push_back(path(*token)); - } - - int result = 0; - for (std::vector<path>::const_iterator dir = search_dirs.begin(); - dir != search_dirs.end(); - ++dir) try { - for (directory_iterator entry(*dir); - entry != directory_iterator(); - ++entry) { - result = (func)(entry->path().external_file_string().c_str(), - data); - if (result != 0) { return result; } - } - } catch (boost::filesystem::filesystem_error &) {} - return result; -# else - return lt_dlforeachfile(search_path, func, data); -# endif -} - -openvrml::local::dl::handle openvrml::local::dl::open(const char * filename) -{ -# ifdef _WIN32 - const char * last_dot = strrchr(filename, '.'); - if (strcmp(last_dot, ".dll") != 0) { return 0; } - return LoadLibrary(filename); -# else - return lt_dlopenext(filename); -# endif -} - -const std::string openvrml::local::dl::error() -{ -# ifdef _WIN32 - const DWORD err = GetLastError(); - char * buf = 0; - scope_guard buf_guard = make_guard(LocalFree, boost::ref(buf)); - static const LPCVOID source = 0; - static const DWORD buf_size = 0; - static va_list * const args = 0; - const DWORD buf_chars = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER - | FORMAT_MESSAGE_FROM_SYSTEM, - source, - err, - LANG_USER_DEFAULT, - reinterpret_cast<LPSTR>(&buf), - buf_size, - args); - assert(buf_chars != 0); // If FormatMessage failed, just give up. - const std::string buf_str(buf ? buf : ""); - return buf_str; -# else - return lt_dlerror(); -# endif -} - -int openvrml::local::dl::close(handle h) -{ -# ifdef _WIN32 - return FreeLibrary(h); -# else - return lt_dlclose(h); -# endif -} - -void * openvrml::local::dl::sym(handle h, const char * name) -{ -# ifdef _WIN32 - return GetProcAddress(h, name); -# else - return lt_dlsym(h, name); -# endif -} Copied: branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp (from rev 3979, trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp) =================================================================== --- branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp (rev 0) +++ branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp 2009-08-02 04:49:17 UTC (rev 3980) @@ -0,0 +1,172 @@ +// -*- mode: c++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*- +// +// OpenVRML +// +// Copyright 2008 Braden McDaniel +// +// This library is free software; you can redistribute it and/or modify it +// under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 3 of the License, or (at your +// option) any later version. +// +// This library 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 Lesser General Public +// License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this library; if not, see <http://www.gnu.org/licenses/>. +// + +# include "dl.h" +# include <boost/filesystem.hpp> +# include <boost/ref.hpp> +# include <boost/tokenizer.hpp> +# include <boost/multi_index/detail/scope_guard.hpp> + +using namespace boost::multi_index::detail; // for scope_guard + +int openvrml::local::dl::init() +{ +# ifdef _WIN32 + return 0; +# else + return lt_dlinit(); +# endif +} + +int openvrml::local::dl::exit() +{ +# ifdef _WIN32 + return 0; +# else + return lt_dlexit(); +# endif +} + +namespace { + + struct OPENVRML_LOCAL win32_search_path_tokenizer { + win32_search_path_tokenizer() + {} + + template <typename Iterator, typename Token> + bool operator()(Iterator & next, Iterator end, Token & tok) + { + while (next != end) { + if (*next == ';') { + ++next; + break; + } + this->tok_.push_back(*next); + ++next; + } + if (!this->tok_.empty()) { + tok = this->tok_; + this->tok_.clear(); + return true; + } + return false; + } + + void reset() + { + this->tok_.clear(); + } + + private: + std::string tok_; + }; +} + +int +openvrml::local::dl::foreachfile(const char * search_path, + int (*func)(const char * filename, void * data), + void * data) +{ +# ifdef _WIN32 + using boost::filesystem::path; + using boost::filesystem::directory_iterator; + typedef boost::tokenizer<win32_search_path_tokenizer> tokenizer_t; + + std::vector<path> search_dirs; + win32_search_path_tokenizer tokenizer_func; + std::string search_path_str(search_path); + tokenizer_t tokenizer(search_path_str, tokenizer_func); + for (tokenizer_t::const_iterator token = tokenizer.begin(); + token != tokenizer.end(); + ++token) { + search_dirs.push_back(path(*token)); + } + + int result = 0; + for (std::vector<path>::const_iterator dir = search_dirs.begin(); + dir != search_dirs.end(); + ++dir) try { + for (directory_iterator entry(*dir); + entry != directory_iterator(); + ++entry) { + result = (func)(entry->path().external_file_string().c_str(), + data); + if (result != 0) { return result; } + } + } catch (boost::filesystem::filesystem_error &) {} + return result; +# else + return lt_dlforeachfile(search_path, func, data); +# endif +} + +openvrml::local::dl::handle openvrml::local::dl::open(const char * filename) +{ +# ifdef _WIN32 + const char * last_dot = strrchr(filename, '.'); + if (strcmp(last_dot, ".dll") != 0) { return 0; } + return LoadLibrary(filename); +# else + return lt_dlopenext(filename); +# endif +} + +const std::string openvrml::local::dl::error() +{ +# ifdef _WIN32 + const DWORD err = GetLastError(); + char * buf = 0; + scope_guard buf_guard = make_guard(LocalFree, boost::ref(buf)); + static const LPCVOID source = 0; + static const DWORD buf_size = 0; + static va_list * const args = 0; + const DWORD buf_chars = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER + | FORMAT_MESSAGE_FROM_SYSTEM, + source, + err, + LANG_USER_DEFAULT, + reinterpret_cast<LPSTR>(&buf), + buf_size, + args); + assert(buf_chars != 0); // If FormatMessage failed, just give up. + const std::string buf_str(buf ? buf : ""); + return buf_str; +# else + return lt_dlerror(); +# endif +} + +int openvrml::local::dl::close(handle h) +{ +# ifdef _WIN32 + return FreeLibrary(h); +# else + return lt_dlclose(h); +# endif +} + +void * openvrml::local::dl::sym(handle h, const char * name) +{ +# ifdef _WIN32 + return GetProcAddress(h, name); +# else + return lt_dlsym(h, name); +# endif +} Deleted: branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.h =================================================================== --- trunk/src/local/libopenvrml-dl/openvrml/local/dl.h 2009-08-02 04:45:09 UTC (rev 3979) +++ branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.h 2009-08-02 04:49:17 UTC (rev 3980) @@ -1,64 +0,0 @@ -// -*- mode: c++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*- -// -// OpenVRML -// -// Copyright 2008 Braden McDaniel -// -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Lesser General Public License as published by -// the Free Software Foundation; either version 3 of the License, or (at your -// option) any later version. -// -// This library 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 Lesser General Public -// License for more details. -// -// You should have received a copy of the GNU Lesser General Public License -// along with this library; if not, see <http://www.gnu.org/licenses/>. -// - -# ifndef OPENVRML_LOCAL_DL_H -# define OPENVRML_LOCAL_DL_H - -# include <openvrml-common.h> -# ifdef _WIN32 -# include <windows.h> -# else -# include <ltdl.h> -# endif -# include <string> - -namespace openvrml { - - namespace local { - - namespace dl { - - OPENVRML_LOCAL int init(); - - OPENVRML_LOCAL int exit(); - - OPENVRML_LOCAL - int foreachfile(const char * search_path, - int (*func)(const char * filename, void * data), - void * data); - -# ifdef _WIN32 - typedef HMODULE handle; -# else - typedef lt_dlhandle handle; -# endif - - OPENVRML_LOCAL handle open(const char * filename); - - OPENVRML_LOCAL const std::string error(); - - OPENVRML_LOCAL int close(handle); - - OPENVRML_LOCAL void * sym(handle, const char * name); - } - } -} - -# endif // ifndef OPENVRML_LOCAL_DL_H Copied: branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.h (from rev 3979, trunk/src/local/libopenvrml-dl/openvrml/local/dl.h) =================================================================== --- branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.h (rev 0) +++ branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.h 2009-08-02 04:49:17 UTC (rev 3980) @@ -0,0 +1,64 @@ +// -*- mode: c++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*- +// +// OpenVRML +// +// Copyright 2008 Braden McDaniel +// +// This library is free software; you can redistribute it and/or modify it +// under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 3 of the License, or (at your +// option) any later version. +// +// This library 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 Lesser General Public +// License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this library; if not, see <http://www.gnu.org/licenses/>. +// + +# ifndef OPENVRML_LOCAL_DL_H +# define OPENVRML_LOCAL_DL_H + +# include <openvrml-common.h> +# ifdef _WIN32 +# include <windows.h> +# else +# include <ltdl.h> +# endif +# include <string> + +namespace openvrml { + + namespace local { + + namespace dl { + + OPENVRML_LOCAL int init(); + + OPENVRML_LOCAL int exit(); + + OPENVRML_LOCAL + int foreachfile(const char * search_path, + int (*func)(const char * filename, void * data), + void * data); + +# ifdef _WIN32 + typedef HMODULE handle; +# else + typedef lt_dlhandle handle; +# endif + + OPENVRML_LOCAL handle open(const char * filename); + + OPENVRML_LOCAL const std::string error(); + + OPENVRML_LOCAL int close(handle); + + OPENVRML_LOCAL void * sym(handle, const char * name); + } + } +} + +# endif // ifndef OPENVRML_LOCAL_DL_H Property changes on: branches/0.18/src/mozilla-plugin ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976 + /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979 Property changes on: branches/0.18/src/node/vrml97/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976 + /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979 Property changes on: branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976 + /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976 + /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976 + /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976 + /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976 + /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976 + /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976 + /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976 + /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976 + /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976 + /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976 + /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979 Property changes on: branches/0.18/src/node/x3d-core/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976 + /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976 + /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3... [truncated message content] |
From: <br...@us...> - 2009-08-02 06:15:41
|
Revision: 3982 http://openvrml.svn.sourceforge.net/openvrml/?rev=3982&view=rev Author: braden Date: 2009-08-02 06:15:32 +0000 (Sun, 02 Aug 2009) Log Message: ----------- Moved libltdl/LoadLibrary wrapper to its own static library. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj Added Paths: ----------- branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-dl/ branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-dl/openvrml-dl.vcproj Removed Paths: ------------- branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-dl/openvrml-dl.vcproj Property Changed: ---------------- branches/0.18/ branches/0.18/src/libopenvrml/openvrml/bad_url.cpp branches/0.18/src/libopenvrml/openvrml/bad_url.h branches/0.18/src/libopenvrml/openvrml/local/proto.cpp branches/0.18/src/libopenvrml/openvrml/local/proto.h branches/0.18/src/libopenvrml/openvrml/scene.cpp branches/0.18/src/libopenvrml/openvrml/scene.h branches/0.18/src/libopenvrml/openvrml/script.cpp branches/0.18/src/mozilla-plugin/ branches/0.18/src/node/vrml97/register_node_metatypes.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.h branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp branches/0.18/src/node/x3d-core/metadata_double.cpp branches/0.18/src/node/x3d-core/metadata_double.h branches/0.18/src/node/x3d-core/metadata_float.cpp branches/0.18/src/node/x3d-core/metadata_float.h branches/0.18/src/node/x3d-core/metadata_integer.cpp branches/0.18/src/node/x3d-core/metadata_integer.h branches/0.18/src/node/x3d-core/metadata_set.cpp branches/0.18/src/node/x3d-core/metadata_set.h branches/0.18/src/node/x3d-core/metadata_string.cpp branches/0.18/src/node/x3d-core/metadata_string.h branches/0.18/src/node/x3d-core/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/espdu_transform.cpp branches/0.18/src/node/x3d-dis/espdu_transform.h branches/0.18/src/node/x3d-dis/receiver_pdu.cpp branches/0.18/src/node/x3d-dis/receiver_pdu.h branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/signal_pdu.cpp branches/0.18/src/node/x3d-dis/signal_pdu.h branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp branches/0.18/src/node/x3d-dis/transmitter_pdu.h branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.h branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp branches/0.18/src/node/x3d-event-utilities/boolean_filter.h branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp branches/0.18/src/node/x3d-event-utilities/integer_trigger.h branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.h branches/0.18/src/node/x3d-geometry2d/arc2d.cpp branches/0.18/src/node/x3d-geometry2d/arc2d.h branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp branches/0.18/src/node/x3d-geometry2d/arc_close2d.h branches/0.18/src/node/x3d-geometry2d/circle2d.cpp branches/0.18/src/node/x3d-geometry2d/circle2d.h branches/0.18/src/node/x3d-geometry2d/disk2d.cpp branches/0.18/src/node/x3d-geometry2d/disk2d.h branches/0.18/src/node/x3d-geometry2d/polyline2d.cpp branches/0.18/src/node/x3d-geometry2d/polyline2d.h branches/0.18/src/node/x3d-geometry2d/polypoint2d.cpp branches/0.18/src/node/x3d-geometry2d/polypoint2d.h branches/0.18/src/node/x3d-geometry2d/rectangle2d.cpp branches/0.18/src/node/x3d-geometry2d/rectangle2d.h branches/0.18/src/node/x3d-geometry2d/register_node_metatypes.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.h branches/0.18/src/node/x3d-geospatial/geo_coordinate.cpp branches/0.18/src/node/x3d-geospatial/geo_coordinate.h branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.cpp branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.h branches/0.18/src/node/x3d-geospatial/geo_location.cpp branches/0.18/src/node/x3d-geospatial/geo_location.h branches/0.18/src/node/x3d-geospatial/geo_lod.cpp branches/0.18/src/node/x3d-geospatial/geo_lod.h branches/0.18/src/node/x3d-geospatial/geo_metadata.cpp branches/0.18/src/node/x3d-geospatial/geo_metadata.h branches/0.18/src/node/x3d-geospatial/geo_origin.cpp branches/0.18/src/node/x3d-geospatial/geo_origin.h branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.cpp branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.h branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.cpp branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.h branches/0.18/src/node/x3d-geospatial/geo_viewpoint.cpp branches/0.18/src/node/x3d-geospatial/geo_viewpoint.h branches/0.18/src/node/x3d-geospatial/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/static_group.cpp branches/0.18/src/node/x3d-grouping/static_group.h branches/0.18/src/node/x3d-h-anim/h_anim_displacer.cpp branches/0.18/src/node/x3d-h-anim/h_anim_displacer.h branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.cpp branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.h branches/0.18/src/node/x3d-h-anim/h_anim_joint.cpp branches/0.18/src/node/x3d-h-anim/h_anim_joint.h branches/0.18/src/node/x3d-h-anim/h_anim_segment.cpp branches/0.18/src/node/x3d-h-anim/h_anim_segment.h branches/0.18/src/node/x3d-h-anim/h_anim_site.cpp branches/0.18/src/node/x3d-h-anim/h_anim_site.h branches/0.18/src/node/x3d-h-anim/register_node_metatypes.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.h branches/0.18/src/node/x3d-interpolation/position_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/position_interpolator2d.h branches/0.18/src/node/x3d-interpolation/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.h branches/0.18/src/node/x3d-key-device-sensor/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.h branches/0.18/src/node/x3d-networking/load_sensor.cpp branches/0.18/src/node/x3d-networking/load_sensor.h branches/0.18/src/node/x3d-networking/register_node_metatypes.cpp branches/0.18/src/node/x3d-nurbs/contour2d.cpp branches/0.18/src/node/x3d-nurbs/contour2d.h branches/0.18/src/node/x3d-nurbs/contour_polyline2d.cpp branches/0.18/src/node/x3d-nurbs/contour_polyline2d.h branches/0.18/src/node/x3d-nurbs/coordinate_double.cpp branches/0.18/src/node/x3d-nurbs/coordinate_double.h branches/0.18/src/node/x3d-nurbs/nurbs_curve.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve.h branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.h branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_set.cpp branches/0.18/src/node/x3d-nurbs/nurbs_set.h branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.h branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.h branches/0.18/src/node/x3d-nurbs/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/color_rgba.cpp branches/0.18/src/node/x3d-rendering/color_rgba.h branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.h branches/0.18/src/node/x3d-rendering/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.h branches/0.18/src/node/x3d-rendering/triangle_set.cpp branches/0.18/src/node/x3d-rendering/triangle_set.h branches/0.18/src/node/x3d-rendering/triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/triangle_strip_set.h branches/0.18/src/node/x3d-shape/fill_properties.cpp branches/0.18/src/node/x3d-shape/fill_properties.h branches/0.18/src/node/x3d-shape/line_properties.cpp branches/0.18/src/node/x3d-shape/line_properties.h branches/0.18/src/node/x3d-shape/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/multi_texture.cpp branches/0.18/src/node/x3d-texturing/multi_texture.h branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.cpp branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.h branches/0.18/src/node/x3d-texturing/multi_texture_transform.cpp branches/0.18/src/node/x3d-texturing/multi_texture_transform.h branches/0.18/src/node/x3d-texturing/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.h Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2009-08-02 06:12:46 UTC (rev 3981) +++ branches/0.18/ChangeLog 2009-08-02 06:15:32 UTC (rev 3982) @@ -1,5 +1,15 @@ 2009-08-02 Braden McDaniel <br...@en...> + Moved libltdl/LoadLibrary wrapper to its own static library. + + * ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln + * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj: + Use openvrml-dl static library. + * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-dl/openvrml-dl.vcproj: + Added. + +2009-08-02 Braden McDaniel <br...@en...> + Moved libltdl/LoadLibrary wrapper to its own convenience library. * src/Makefile.am Modified: branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln =================================================================== --- branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln 2009-08-02 06:12:46 UTC (rev 3981) +++ branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln 2009-08-02 06:15:32 UTC (rev 3982) @@ -1,6 +1,9 @@ Microsoft Visual Studio Solution File, Format Version 10.00 # Visual C++ Express 2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openvrml", "openvrml\openvrml.vcproj", "{E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}" + ProjectSection(ProjectDependencies) = postProject + {95FA0E9B-DF2F-48C3-B07D-AB3A93E44E5C} = {95FA0E9B-DF2F-48C3-B07D-AB3A93E44E5C} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openvrml-gl", "openvrml-gl\openvrml-gl.vcproj", "{141F90C2-6630-4D7A-834F-D5D57C6CFC24}" ProjectSection(ProjectDependencies) = postProject @@ -119,6 +122,8 @@ {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C} = {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openvrml-dl", "openvrml-dl\openvrml-dl.vcproj", "{95FA0E9B-DF2F-48C3-B07D-AB3A93E44E5C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -221,6 +226,10 @@ {D9D29F52-CFE0-42A1-A150-47CBAAE89030}.Debug|Win32.Build.0 = Debug|Win32 {D9D29F52-CFE0-42A1-A150-47CBAAE89030}.Release|Win32.ActiveCfg = Release|Win32 {D9D29F52-CFE0-42A1-A150-47CBAAE89030}.Release|Win32.Build.0 = Release|Win32 + {95FA0E9B-DF2F-48C3-B07D-AB3A93E44E5C}.Debug|Win32.ActiveCfg = Debug|Win32 + {95FA0E9B-DF2F-48C3-B07D-AB3A93E44E5C}.Debug|Win32.Build.0 = Debug|Win32 + {95FA0E9B-DF2F-48C3-B07D-AB3A93E44E5C}.Release|Win32.ActiveCfg = Release|Win32 + {95FA0E9B-DF2F-48C3-B07D-AB3A93E44E5C}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Modified: branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj =================================================================== --- branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj 2009-08-02 06:12:46 UTC (rev 3981) +++ branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj 2009-08-02 06:15:32 UTC (rev 3982) @@ -232,10 +232,6 @@ > </File> <File - RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\local\dl.cpp" - > - </File> - <File RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\event.cpp" > </File> @@ -341,10 +337,6 @@ > </File> <File - RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\local\dl.h" - > - </File> - <File RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\event.h" > </File> Property changes on: branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-dl ___________________________________________________________________ Added: svn:ignore + Debug Release *.vcproj.*.user Deleted: branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-dl/openvrml-dl.vcproj =================================================================== --- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-dl/openvrml-dl.vcproj 2009-08-02 06:12:46 UTC (rev 3981) +++ branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-dl/openvrml-dl.vcproj 2009-08-02 06:15:32 UTC (rev 3982) @@ -1,177 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9.00" - Name="openvrml-dl" - ProjectGUID="{95FA0E9B-DF2F-48C3-B07D-AB3A93E44E5C}" - RootNamespace="openvrmldl" - Keyword="Win32Proj" - TargetFrameworkVersion="196613" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="4" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml" - PreprocessorDefinitions="OPENVRML_BUILD_DLL" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - UsePrecompiledHeader="0" - WarningLevel="3" - DebugInformationFormat="4" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="4" - CharacterSet="2" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml" - PreprocessorDefinitions="_SECURE_SCL=0;NDEBUG;OPENVRML_BUILD_DLL" - RuntimeLibrary="2" - EnableFunctionLevelLinking="true" - UsePrecompiledHeader="0" - WarningLevel="3" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" - UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" - > - <File - RelativePath="..\..\..\..\..\src\local\libopenvrml-dl\openvrml\local\dl.cpp" - > - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl;inc;xsd" - UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" - > - <File - RelativePath="..\..\..\..\..\src\local\libopenvrml-dl\openvrml\local\dl.h" - > - </File> - </Filter> - <Filter - Name="Resource Files" - Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" - UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" - > - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> Copied: branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-dl/openvrml-dl.vcproj (from rev 3981, trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-dl/openvrml-dl.vcproj) =================================================================== --- branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-dl/openvrml-dl.vcproj (rev 0) +++ branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-dl/openvrml-dl.vcproj 2009-08-02 06:15:32 UTC (rev 3982) @@ -0,0 +1,177 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="openvrml-dl" + ProjectGUID="{95FA0E9B-DF2F-48C3-B07D-AB3A93E44E5C}" + RootNamespace="openvrmldl" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml" + PreprocessorDefinitions="OPENVRML_BUILD_DLL" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml" + PreprocessorDefinitions="_SECURE_SCL=0;NDEBUG;OPENVRML_BUILD_DLL" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath="..\..\..\..\..\src\local\libopenvrml-dl\openvrml\local\dl.cpp" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath="..\..\..\..\..\src\local\libopenvrml-dl\openvrml\local\dl.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/libopenvrml/openvrml/script.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/mozilla-plugin ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/node/vrml97/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/node/x3d-core/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/node/x3d-dis/transmitter_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 /trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 /trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/node/x3d-environmental-effects/texture_background.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.h:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_filter.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.h:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979 + /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h ______________________________________________________________... [truncated message content] |
From: <br...@us...> - 2009-08-02 07:56:39
|
Revision: 3984 http://openvrml.svn.sourceforge.net/openvrml/?rev=3984&view=rev Author: braden Date: 2009-08-02 07:56:29 +0000 (Sun, 02 Aug 2009) Log Message: ----------- Removed obsolete -I flags when building libopenvrml. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj branches/0.18/src/Makefile.am Property Changed: ---------------- branches/0.18/ branches/0.18/src/libopenvrml/openvrml/bad_url.cpp branches/0.18/src/libopenvrml/openvrml/bad_url.h branches/0.18/src/libopenvrml/openvrml/local/proto.cpp branches/0.18/src/libopenvrml/openvrml/local/proto.h branches/0.18/src/libopenvrml/openvrml/scene.cpp branches/0.18/src/libopenvrml/openvrml/scene.h branches/0.18/src/libopenvrml/openvrml/script.cpp branches/0.18/src/mozilla-plugin/ branches/0.18/src/node/vrml97/register_node_metatypes.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.h branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp branches/0.18/src/node/x3d-core/metadata_double.cpp branches/0.18/src/node/x3d-core/metadata_double.h branches/0.18/src/node/x3d-core/metadata_float.cpp branches/0.18/src/node/x3d-core/metadata_float.h branches/0.18/src/node/x3d-core/metadata_integer.cpp branches/0.18/src/node/x3d-core/metadata_integer.h branches/0.18/src/node/x3d-core/metadata_set.cpp branches/0.18/src/node/x3d-core/metadata_set.h branches/0.18/src/node/x3d-core/metadata_string.cpp branches/0.18/src/node/x3d-core/metadata_string.h branches/0.18/src/node/x3d-core/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/espdu_transform.cpp branches/0.18/src/node/x3d-dis/espdu_transform.h branches/0.18/src/node/x3d-dis/receiver_pdu.cpp branches/0.18/src/node/x3d-dis/receiver_pdu.h branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/signal_pdu.cpp branches/0.18/src/node/x3d-dis/signal_pdu.h branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp branches/0.18/src/node/x3d-dis/transmitter_pdu.h branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.h branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp branches/0.18/src/node/x3d-event-utilities/boolean_filter.h branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp branches/0.18/src/node/x3d-event-utilities/integer_trigger.h branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.h branches/0.18/src/node/x3d-geometry2d/arc2d.cpp branches/0.18/src/node/x3d-geometry2d/arc2d.h branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp branches/0.18/src/node/x3d-geometry2d/arc_close2d.h branches/0.18/src/node/x3d-geometry2d/circle2d.cpp branches/0.18/src/node/x3d-geometry2d/circle2d.h branches/0.18/src/node/x3d-geometry2d/disk2d.cpp branches/0.18/src/node/x3d-geometry2d/disk2d.h branches/0.18/src/node/x3d-geometry2d/polyline2d.cpp branches/0.18/src/node/x3d-geometry2d/polyline2d.h branches/0.18/src/node/x3d-geometry2d/polypoint2d.cpp branches/0.18/src/node/x3d-geometry2d/polypoint2d.h branches/0.18/src/node/x3d-geometry2d/rectangle2d.cpp branches/0.18/src/node/x3d-geometry2d/rectangle2d.h branches/0.18/src/node/x3d-geometry2d/register_node_metatypes.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.h branches/0.18/src/node/x3d-geospatial/geo_coordinate.cpp branches/0.18/src/node/x3d-geospatial/geo_coordinate.h branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.cpp branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.h branches/0.18/src/node/x3d-geospatial/geo_location.cpp branches/0.18/src/node/x3d-geospatial/geo_location.h branches/0.18/src/node/x3d-geospatial/geo_lod.cpp branches/0.18/src/node/x3d-geospatial/geo_lod.h branches/0.18/src/node/x3d-geospatial/geo_metadata.cpp branches/0.18/src/node/x3d-geospatial/geo_metadata.h branches/0.18/src/node/x3d-geospatial/geo_origin.cpp branches/0.18/src/node/x3d-geospatial/geo_origin.h branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.cpp branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.h branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.cpp branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.h branches/0.18/src/node/x3d-geospatial/geo_viewpoint.cpp branches/0.18/src/node/x3d-geospatial/geo_viewpoint.h branches/0.18/src/node/x3d-geospatial/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/static_group.cpp branches/0.18/src/node/x3d-grouping/static_group.h branches/0.18/src/node/x3d-h-anim/h_anim_displacer.cpp branches/0.18/src/node/x3d-h-anim/h_anim_displacer.h branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.cpp branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.h branches/0.18/src/node/x3d-h-anim/h_anim_joint.cpp branches/0.18/src/node/x3d-h-anim/h_anim_joint.h branches/0.18/src/node/x3d-h-anim/h_anim_segment.cpp branches/0.18/src/node/x3d-h-anim/h_anim_segment.h branches/0.18/src/node/x3d-h-anim/h_anim_site.cpp branches/0.18/src/node/x3d-h-anim/h_anim_site.h branches/0.18/src/node/x3d-h-anim/register_node_metatypes.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.h branches/0.18/src/node/x3d-interpolation/position_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/position_interpolator2d.h branches/0.18/src/node/x3d-interpolation/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.h branches/0.18/src/node/x3d-key-device-sensor/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.h branches/0.18/src/node/x3d-networking/load_sensor.cpp branches/0.18/src/node/x3d-networking/load_sensor.h branches/0.18/src/node/x3d-networking/register_node_metatypes.cpp branches/0.18/src/node/x3d-nurbs/contour2d.cpp branches/0.18/src/node/x3d-nurbs/contour2d.h branches/0.18/src/node/x3d-nurbs/contour_polyline2d.cpp branches/0.18/src/node/x3d-nurbs/contour_polyline2d.h branches/0.18/src/node/x3d-nurbs/coordinate_double.cpp branches/0.18/src/node/x3d-nurbs/coordinate_double.h branches/0.18/src/node/x3d-nurbs/nurbs_curve.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve.h branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.h branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_set.cpp branches/0.18/src/node/x3d-nurbs/nurbs_set.h branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.h branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.h branches/0.18/src/node/x3d-nurbs/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/color_rgba.cpp branches/0.18/src/node/x3d-rendering/color_rgba.h branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.h branches/0.18/src/node/x3d-rendering/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.h branches/0.18/src/node/x3d-rendering/triangle_set.cpp branches/0.18/src/node/x3d-rendering/triangle_set.h branches/0.18/src/node/x3d-rendering/triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/triangle_strip_set.h branches/0.18/src/node/x3d-shape/fill_properties.cpp branches/0.18/src/node/x3d-shape/fill_properties.h branches/0.18/src/node/x3d-shape/line_properties.cpp branches/0.18/src/node/x3d-shape/line_properties.h branches/0.18/src/node/x3d-shape/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/multi_texture.cpp branches/0.18/src/node/x3d-texturing/multi_texture.h branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.cpp branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.h branches/0.18/src/node/x3d-texturing/multi_texture_transform.cpp branches/0.18/src/node/x3d-texturing/multi_texture_transform.h branches/0.18/src/node/x3d-texturing/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.h Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2009-08-02 07:53:50 UTC (rev 3983) +++ branches/0.18/ChangeLog 2009-08-02 07:56:29 UTC (rev 3984) @@ -1,5 +1,13 @@ 2009-08-02 Braden McDaniel <br...@en...> + Removed obsolete -I flags when building libopenvrml. + + * src/Makefile.am + (libopenvrml_libopenvrml_la_CPPFLAGS): Removed obsolete -I flags. + * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj + +2009-08-02 Braden McDaniel <br...@en...> + Moved libltdl/LoadLibrary wrapper to its own static library. * ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln Modified: branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj =================================================================== --- branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj 2009-08-02 07:53:50 UTC (rev 3983) +++ branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj 2009-08-02 07:56:29 UTC (rev 3984) @@ -41,7 +41,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\src\node" + AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml" PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION=\"0.18.2\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\"\";OPENVRML_PKGLIBDIR_=\"\"" MinimalRebuild="false" BasicRuntimeChecks="0" @@ -126,7 +126,7 @@ Optimization="3" InlineFunctionExpansion="1" OmitFramePointers="true" - AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\src\node" + AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml" PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;PACKAGE_VERSION=\"0.18.2\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\"\";OPENVRML_PKGLIBDIR_=\"\";NDEBUG" StringPooling="true" RuntimeLibrary="2" Modified: branches/0.18/src/Makefile.am =================================================================== --- branches/0.18/src/Makefile.am 2009-08-02 07:53:50 UTC (rev 3983) +++ branches/0.18/src/Makefile.am 2009-08-02 07:56:29 UTC (rev 3984) @@ -66,8 +66,6 @@ -I$(top_builddir)/src/libopenvrml \ -I$(top_srcdir)/src/libopenvrml \ -I$(top_srcdir)/src/local/libopenvrml-dl \ - -I$(srcdir)/node \ - -I$(srcdir)/node/vrml97 \ -DOPENVRML_LIBDIR_=\"$(libdir)\" \ -DOPENVRML_PKGDATADIR_=\"$(pkgdatadir)\" \ -DOPENVRML_PKGLIBDIR_=\"$(pkglibdir)\" \ Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/libopenvrml/openvrml/script.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/mozilla-plugin ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/vrml97/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-core/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-dis/transmitter_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 /trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 /trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-environmental-effects/texture_background.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_filter.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/local/src/node/x3d-event-utilities/integer_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3734 /trunk/src/node/x3d-event-utilities/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/0.17/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3734 /trunk/src/node/x3d-event-utilities/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/time_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/time_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/local/src/node/x3d-event-utilities/time_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/time_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-event-utilities/time_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/time_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/time_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981 + /branches/local/src/node/x3d-event-utilities/time_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/time_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 Property changes on: branches/0.18/src/node/x3d-geometry2d/arc2d.cpp ___________________________... [truncated message content] |
From: <br...@us...> - 2009-08-03 06:41:54
|
Revision: 3986 http://openvrml.svn.sourceforge.net/openvrml/?rev=3986&view=rev Author: braden Date: 2009-08-03 06:41:42 +0000 (Mon, 03 Aug 2009) Log Message: ----------- Converted Java scripting backend to use libopenvrml-dl to load libjvm rather than using libltdl directly. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/src/Makefile.am branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.h branches/0.18/src/script/java.cpp Property Changed: ---------------- branches/0.18/ branches/0.18/src/libopenvrml/openvrml/bad_url.cpp branches/0.18/src/libopenvrml/openvrml/bad_url.h branches/0.18/src/libopenvrml/openvrml/local/proto.cpp branches/0.18/src/libopenvrml/openvrml/local/proto.h branches/0.18/src/libopenvrml/openvrml/scene.cpp branches/0.18/src/libopenvrml/openvrml/scene.h branches/0.18/src/libopenvrml/openvrml/script.cpp branches/0.18/src/mozilla-plugin/ branches/0.18/src/node/vrml97/register_node_metatypes.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.h branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp branches/0.18/src/node/x3d-core/metadata_double.cpp branches/0.18/src/node/x3d-core/metadata_double.h branches/0.18/src/node/x3d-core/metadata_float.cpp branches/0.18/src/node/x3d-core/metadata_float.h branches/0.18/src/node/x3d-core/metadata_integer.cpp branches/0.18/src/node/x3d-core/metadata_integer.h branches/0.18/src/node/x3d-core/metadata_set.cpp branches/0.18/src/node/x3d-core/metadata_set.h branches/0.18/src/node/x3d-core/metadata_string.cpp branches/0.18/src/node/x3d-core/metadata_string.h branches/0.18/src/node/x3d-core/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/espdu_transform.cpp branches/0.18/src/node/x3d-dis/espdu_transform.h branches/0.18/src/node/x3d-dis/receiver_pdu.cpp branches/0.18/src/node/x3d-dis/receiver_pdu.h branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/signal_pdu.cpp branches/0.18/src/node/x3d-dis/signal_pdu.h branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp branches/0.18/src/node/x3d-dis/transmitter_pdu.h branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.h branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp branches/0.18/src/node/x3d-event-utilities/boolean_filter.h branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp branches/0.18/src/node/x3d-event-utilities/integer_trigger.h branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.h branches/0.18/src/node/x3d-geometry2d/arc2d.cpp branches/0.18/src/node/x3d-geometry2d/arc2d.h branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp branches/0.18/src/node/x3d-geometry2d/arc_close2d.h branches/0.18/src/node/x3d-geometry2d/circle2d.cpp branches/0.18/src/node/x3d-geometry2d/circle2d.h branches/0.18/src/node/x3d-geometry2d/disk2d.cpp branches/0.18/src/node/x3d-geometry2d/disk2d.h branches/0.18/src/node/x3d-geometry2d/polyline2d.cpp branches/0.18/src/node/x3d-geometry2d/polyline2d.h branches/0.18/src/node/x3d-geometry2d/polypoint2d.cpp branches/0.18/src/node/x3d-geometry2d/polypoint2d.h branches/0.18/src/node/x3d-geometry2d/rectangle2d.cpp branches/0.18/src/node/x3d-geometry2d/rectangle2d.h branches/0.18/src/node/x3d-geometry2d/register_node_metatypes.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.h branches/0.18/src/node/x3d-geospatial/geo_coordinate.cpp branches/0.18/src/node/x3d-geospatial/geo_coordinate.h branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.cpp branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.h branches/0.18/src/node/x3d-geospatial/geo_location.cpp branches/0.18/src/node/x3d-geospatial/geo_location.h branches/0.18/src/node/x3d-geospatial/geo_lod.cpp branches/0.18/src/node/x3d-geospatial/geo_lod.h branches/0.18/src/node/x3d-geospatial/geo_metadata.cpp branches/0.18/src/node/x3d-geospatial/geo_metadata.h branches/0.18/src/node/x3d-geospatial/geo_origin.cpp branches/0.18/src/node/x3d-geospatial/geo_origin.h branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.cpp branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.h branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.cpp branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.h branches/0.18/src/node/x3d-geospatial/geo_viewpoint.cpp branches/0.18/src/node/x3d-geospatial/geo_viewpoint.h branches/0.18/src/node/x3d-geospatial/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/static_group.cpp branches/0.18/src/node/x3d-grouping/static_group.h branches/0.18/src/node/x3d-h-anim/h_anim_displacer.cpp branches/0.18/src/node/x3d-h-anim/h_anim_displacer.h branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.cpp branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.h branches/0.18/src/node/x3d-h-anim/h_anim_joint.cpp branches/0.18/src/node/x3d-h-anim/h_anim_joint.h branches/0.18/src/node/x3d-h-anim/h_anim_segment.cpp branches/0.18/src/node/x3d-h-anim/h_anim_segment.h branches/0.18/src/node/x3d-h-anim/h_anim_site.cpp branches/0.18/src/node/x3d-h-anim/h_anim_site.h branches/0.18/src/node/x3d-h-anim/register_node_metatypes.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.h branches/0.18/src/node/x3d-interpolation/position_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/position_interpolator2d.h branches/0.18/src/node/x3d-interpolation/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.h branches/0.18/src/node/x3d-key-device-sensor/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.h branches/0.18/src/node/x3d-networking/load_sensor.cpp branches/0.18/src/node/x3d-networking/load_sensor.h branches/0.18/src/node/x3d-networking/register_node_metatypes.cpp branches/0.18/src/node/x3d-nurbs/contour2d.cpp branches/0.18/src/node/x3d-nurbs/contour2d.h branches/0.18/src/node/x3d-nurbs/contour_polyline2d.cpp branches/0.18/src/node/x3d-nurbs/contour_polyline2d.h branches/0.18/src/node/x3d-nurbs/coordinate_double.cpp branches/0.18/src/node/x3d-nurbs/coordinate_double.h branches/0.18/src/node/x3d-nurbs/nurbs_curve.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve.h branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.h branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_set.cpp branches/0.18/src/node/x3d-nurbs/nurbs_set.h branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.h branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.h branches/0.18/src/node/x3d-nurbs/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/color_rgba.cpp branches/0.18/src/node/x3d-rendering/color_rgba.h branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.h branches/0.18/src/node/x3d-rendering/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.h branches/0.18/src/node/x3d-rendering/triangle_set.cpp branches/0.18/src/node/x3d-rendering/triangle_set.h branches/0.18/src/node/x3d-rendering/triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/triangle_strip_set.h branches/0.18/src/node/x3d-shape/fill_properties.cpp branches/0.18/src/node/x3d-shape/fill_properties.h branches/0.18/src/node/x3d-shape/line_properties.cpp branches/0.18/src/node/x3d-shape/line_properties.h branches/0.18/src/node/x3d-shape/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/multi_texture.cpp branches/0.18/src/node/x3d-texturing/multi_texture.h branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.cpp branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.h branches/0.18/src/node/x3d-texturing/multi_texture_transform.cpp branches/0.18/src/node/x3d-texturing/multi_texture_transform.h branches/0.18/src/node/x3d-texturing/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.h Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2009-08-03 06:38:42 UTC (rev 3985) +++ branches/0.18/ChangeLog 2009-08-03 06:41:42 UTC (rev 3986) @@ -1,3 +1,27 @@ +2009-08-03 Braden McDaniel <br...@en...> + + Converted Java scripting backend to use libopenvrml-dl to load + libjvm rather than using libltdl directly. + + * src/Makefile.am + (script_java_la_CPPFLAGS): Add the libopenvrml-dl source directory + to the include path. + (script_java_la_LIBADD): Added libopenvrml-dl. + * src/local/libopenvrml-dl/openvrml/local/dl.cpp: Added function + openvrml::local::dl::prepend_to_searchpath. + * src/local/libopenvrml-dl/openvrml/local/dl.h: Added function + openvrml::local::dl::prepend_to_searchpath. + * src/script/java.cpp + (create_searchpath_from_java_home(const std::string &)): Removed; + replaced with prepend_java_home_libdirs_to_searchpath. + (prepend_java_home_libdirs_to_searchpath(const std::string &)): + Given a location for the Java Runtime Environment, prepend the + possible locations of libjvm to the runtime library search path. + (load_libjvm::load_libjvm()): Use libopenvrml-dl functions instead + of libltdl ones. + (load_libjvm::~load_libjvm()): Use libopenvrml-dl functions instead + of libltdl ones. + 2009-08-02 Braden McDaniel <br...@en...> Removed obsolete -I flags when building libopenvrml. Modified: branches/0.18/src/Makefile.am =================================================================== --- branches/0.18/src/Makefile.am 2009-08-03 06:38:42 UTC (rev 3985) +++ branches/0.18/src/Makefile.am 2009-08-03 06:41:42 UTC (rev 3986) @@ -163,6 +163,7 @@ -I$(top_builddir)/src/libopenvrml \ -I$(top_srcdir)/src/libopenvrml \ -I$(top_builddir)/src/script/java \ + -I$(top_srcdir)/src/local/libopenvrml-dl \ -DOPENVRML_LIBDIR_=\"$(libdir)\" \ -DOPENVRML_PKGDATADIR_=\"$(pkgdatadir)\" \ -DJAVA_HOME=\"$(JAVA_HOME)\" \ @@ -174,7 +175,8 @@ -no-undefined \ -avoid-version script_java_la_LIBADD = \ - libopenvrml/libopenvrml.la + libopenvrml/libopenvrml.la \ + local/libopenvrml-dl.la openvrmlnodedir = $(pkglibdir)/node openvrmlnode_LTLIBRARIES = \ Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/libopenvrml/openvrml/script.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Modified: branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp =================================================================== --- branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp 2009-08-03 06:38:42 UTC (rev 3985) +++ branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp 2009-08-03 06:41:42 UTC (rev 3986) @@ -117,6 +117,21 @@ # endif } +/** + * @internal + * + * @brief Prepend @p dir to the dynamic library search path. + */ +int openvrml::local::dl::prepend_to_searchpath(const char * const dir) +{ +# ifdef _WIN32 + return SetDllDirectory(dir); +# else + const char * const before = lt_dlgetsearchpath(); + return lt_dlinsertsearchdir(before, dir); +# endif +} + openvrml::local::dl::handle openvrml::local::dl::open(const char * filename) { # ifdef _WIN32 Modified: branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.h =================================================================== --- branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.h 2009-08-03 06:38:42 UTC (rev 3985) +++ branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.h 2009-08-03 06:41:42 UTC (rev 3986) @@ -44,6 +44,8 @@ int (*func)(const char * filename, void * data), void * data); + OPENVRML_LOCAL int prepend_to_searchpath(const char * dir); + # ifdef _WIN32 typedef HMODULE handle; # else Property changes on: branches/0.18/src/mozilla-plugin ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/vrml97/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-core/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-dis/transmitter_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 /trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 /trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-environmental-effects/texture_background.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_filter.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/local/src/node/x3d-event-utilities/integer_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3734 /trunk/src/node/x3d-event-utilities/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983 + /branches/0.17/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3734 /trunk/src/node/x3d-event-utilities/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 Property changes on: branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/time_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/time_trigger.cpp:3958,3965,3967,3969... [truncated message content] |
From: <br...@us...> - 2009-08-07 08:08:14
|
Revision: 3988 http://openvrml.svn.sourceforge.net/openvrml/?rev=3988&view=rev Author: braden Date: 2009-08-07 08:08:03 +0000 (Fri, 07 Aug 2009) Log Message: ----------- Modified openvrml::local::dl interface to use boost::filesystem::path and std::string. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/src/Makefile.am branches/0.18/src/libopenvrml/openvrml/local/conf.cpp branches/0.18/src/libopenvrml/openvrml/local/conf.h branches/0.18/src/libopenvrml/openvrml/local/node_metatype_registry_impl.cpp branches/0.18/src/libopenvrml/openvrml/local/node_metatype_registry_impl.h branches/0.18/src/libopenvrml/openvrml/script.cpp branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.h Property Changed: ---------------- branches/0.18/ branches/0.18/src/libopenvrml/openvrml/bad_url.cpp branches/0.18/src/libopenvrml/openvrml/bad_url.h branches/0.18/src/libopenvrml/openvrml/local/proto.cpp branches/0.18/src/libopenvrml/openvrml/local/proto.h branches/0.18/src/libopenvrml/openvrml/scene.cpp branches/0.18/src/libopenvrml/openvrml/scene.h branches/0.18/src/libopenvrml/openvrml/script.cpp branches/0.18/src/mozilla-plugin/ branches/0.18/src/node/vrml97/register_node_metatypes.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.h branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp branches/0.18/src/node/x3d-core/metadata_double.cpp branches/0.18/src/node/x3d-core/metadata_double.h branches/0.18/src/node/x3d-core/metadata_float.cpp branches/0.18/src/node/x3d-core/metadata_float.h branches/0.18/src/node/x3d-core/metadata_integer.cpp branches/0.18/src/node/x3d-core/metadata_integer.h branches/0.18/src/node/x3d-core/metadata_set.cpp branches/0.18/src/node/x3d-core/metadata_set.h branches/0.18/src/node/x3d-core/metadata_string.cpp branches/0.18/src/node/x3d-core/metadata_string.h branches/0.18/src/node/x3d-core/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/espdu_transform.cpp branches/0.18/src/node/x3d-dis/espdu_transform.h branches/0.18/src/node/x3d-dis/receiver_pdu.cpp branches/0.18/src/node/x3d-dis/receiver_pdu.h branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/signal_pdu.cpp branches/0.18/src/node/x3d-dis/signal_pdu.h branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp branches/0.18/src/node/x3d-dis/transmitter_pdu.h branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.h branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp branches/0.18/src/node/x3d-event-utilities/boolean_filter.h branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp branches/0.18/src/node/x3d-event-utilities/integer_trigger.h branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.h branches/0.18/src/node/x3d-geometry2d/arc2d.cpp branches/0.18/src/node/x3d-geometry2d/arc2d.h branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp branches/0.18/src/node/x3d-geometry2d/arc_close2d.h branches/0.18/src/node/x3d-geometry2d/circle2d.cpp branches/0.18/src/node/x3d-geometry2d/circle2d.h branches/0.18/src/node/x3d-geometry2d/disk2d.cpp branches/0.18/src/node/x3d-geometry2d/disk2d.h branches/0.18/src/node/x3d-geometry2d/polyline2d.cpp branches/0.18/src/node/x3d-geometry2d/polyline2d.h branches/0.18/src/node/x3d-geometry2d/polypoint2d.cpp branches/0.18/src/node/x3d-geometry2d/polypoint2d.h branches/0.18/src/node/x3d-geometry2d/rectangle2d.cpp branches/0.18/src/node/x3d-geometry2d/rectangle2d.h branches/0.18/src/node/x3d-geometry2d/register_node_metatypes.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.h branches/0.18/src/node/x3d-geospatial/geo_coordinate.cpp branches/0.18/src/node/x3d-geospatial/geo_coordinate.h branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.cpp branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.h branches/0.18/src/node/x3d-geospatial/geo_location.cpp branches/0.18/src/node/x3d-geospatial/geo_location.h branches/0.18/src/node/x3d-geospatial/geo_lod.cpp branches/0.18/src/node/x3d-geospatial/geo_lod.h branches/0.18/src/node/x3d-geospatial/geo_metadata.cpp branches/0.18/src/node/x3d-geospatial/geo_metadata.h branches/0.18/src/node/x3d-geospatial/geo_origin.cpp branches/0.18/src/node/x3d-geospatial/geo_origin.h branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.cpp branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.h branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.cpp branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.h branches/0.18/src/node/x3d-geospatial/geo_viewpoint.cpp branches/0.18/src/node/x3d-geospatial/geo_viewpoint.h branches/0.18/src/node/x3d-geospatial/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/static_group.cpp branches/0.18/src/node/x3d-grouping/static_group.h branches/0.18/src/node/x3d-h-anim/h_anim_displacer.cpp branches/0.18/src/node/x3d-h-anim/h_anim_displacer.h branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.cpp branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.h branches/0.18/src/node/x3d-h-anim/h_anim_joint.cpp branches/0.18/src/node/x3d-h-anim/h_anim_joint.h branches/0.18/src/node/x3d-h-anim/h_anim_segment.cpp branches/0.18/src/node/x3d-h-anim/h_anim_segment.h branches/0.18/src/node/x3d-h-anim/h_anim_site.cpp branches/0.18/src/node/x3d-h-anim/h_anim_site.h branches/0.18/src/node/x3d-h-anim/register_node_metatypes.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.h branches/0.18/src/node/x3d-interpolation/position_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/position_interpolator2d.h branches/0.18/src/node/x3d-interpolation/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.h branches/0.18/src/node/x3d-key-device-sensor/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.h branches/0.18/src/node/x3d-networking/load_sensor.cpp branches/0.18/src/node/x3d-networking/load_sensor.h branches/0.18/src/node/x3d-networking/register_node_metatypes.cpp branches/0.18/src/node/x3d-nurbs/contour2d.cpp branches/0.18/src/node/x3d-nurbs/contour2d.h branches/0.18/src/node/x3d-nurbs/contour_polyline2d.cpp branches/0.18/src/node/x3d-nurbs/contour_polyline2d.h branches/0.18/src/node/x3d-nurbs/coordinate_double.cpp branches/0.18/src/node/x3d-nurbs/coordinate_double.h branches/0.18/src/node/x3d-nurbs/nurbs_curve.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve.h branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.h branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_set.cpp branches/0.18/src/node/x3d-nurbs/nurbs_set.h branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.h branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.h branches/0.18/src/node/x3d-nurbs/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/color_rgba.cpp branches/0.18/src/node/x3d-rendering/color_rgba.h branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.h branches/0.18/src/node/x3d-rendering/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.h branches/0.18/src/node/x3d-rendering/triangle_set.cpp branches/0.18/src/node/x3d-rendering/triangle_set.h branches/0.18/src/node/x3d-rendering/triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/triangle_strip_set.h branches/0.18/src/node/x3d-shape/fill_properties.cpp branches/0.18/src/node/x3d-shape/fill_properties.h branches/0.18/src/node/x3d-shape/line_properties.cpp branches/0.18/src/node/x3d-shape/line_properties.h branches/0.18/src/node/x3d-shape/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/multi_texture.cpp branches/0.18/src/node/x3d-texturing/multi_texture.h branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.cpp branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.h branches/0.18/src/node/x3d-texturing/multi_texture_transform.cpp branches/0.18/src/node/x3d-texturing/multi_texture_transform.h branches/0.18/src/node/x3d-texturing/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.h Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2009-08-07 07:58:00 UTC (rev 3987) +++ branches/0.18/ChangeLog 2009-08-07 08:08:03 UTC (rev 3988) @@ -1,3 +1,57 @@ +2009-08-07 Braden McDaniel <br...@en...> + + Modified openvrml::local::dl interface to use + boost::filesystem::path and std::string. + + * src/Makefile.am + (local_libopenvrml_dl_la_LIBADD): Added libboost_filesystem + dependency. + * src/libopenvrml/openvrml/local/conf.cpp + (openvrml::local::conf::datadir()): Return a + boost::filesystem::path. + (openvrml::local::conf::node_path()): Return a std::vector of + boost::filesystem::path to represent the node module search path. + (openvrml::local::conf::script_path()): Return a std::vector of + boost::filesystem::path to represent the script module search + path. + * src/libopenvrml/openvrml/local/conf.h + (openvrml::local::conf::datadir()): Return a + boost::filesystem::path. + (openvrml::local::conf::node_path()): Return a std::vector of + boost::filesystem::path to represent the node module search path. + (openvrml::local::conf::script_path()): Return a std::vector of + boost::filesystem::path to represent the script module search + path. + * src/libopenvrml/openvrml/local/node_metatype_registry_impl.cpp + (openvrml_open_node_module(const std::string &, void *)): Changed + signature to use std::string. + (openvrml::local::node_metatype_registry_impl::node_metatype_registry_impl(openvrml::browser&)): + Use a std::vector of boost::filesystem::path to represent the node + module search path. + * src/libopenvrml/openvrml/local/node_metatype_registry_impl.h + (node_metatype_registry_impl): Use std::string in the signature of + openvrml_open_node_module; changed type of sym to std::string. + * src/local/libopenvrml-dl/openvrml/local/dl.cpp + (openvrml::local::dl::foreachfile(const + std::vector<boost::filesystem::path> &, int (*)(const + std::string&, void *), void *)): Use boost::filesystem::path and + std::string. + (openvrml::local::dl::prepend_to_searchpath(const + boost::filesystem::path &)): Use boost::filesystem::path. + (openvrml::local::dl::open(const std::string &)): Use std::string. + (openvrml::local::dl::sym(handle, const std::string &)): Use + std::string. + * src/local/libopenvrml-dl/openvrml/local/dl.h + (openvrml::local::dl::foreachfile(const + std::vector<boost::filesystem::path> &, int (*)(const + std::string&, void *), void *)): Use boost::filesystem::path and + std::string. + (openvrml::local::dl::prepend_to_searchpath(const + boost::filesystem::path &)): Use boost::filesystem::path. + (openvrml::local::dl::open(const std::string &)): Use std::string. + (openvrml::local::dl::sym(handle, const std::string &)): Use + std::string. + 2009-08-03 Braden McDaniel <br...@en...> Converted Java scripting backend to use libopenvrml-dl to load Modified: branches/0.18/src/Makefile.am =================================================================== --- branches/0.18/src/Makefile.am 2009-08-07 07:58:00 UTC (rev 3987) +++ branches/0.18/src/Makefile.am 2009-08-07 08:08:03 UTC (rev 3988) @@ -130,7 +130,9 @@ local_libopenvrml_dl_la_CPPFLAGS = \ -I$(top_builddir)/src/libopenvrml \ -I$(top_srcdir)/src/libopenvrml -local_libopenvrml_dl_la_LIBADD = -lltdl +local_libopenvrml_dl_la_LIBADD = \ + -lboost_filesystem$(BOOST_LIB_SUFFIX) \ + -lltdl openvrmlscriptdir = $(pkglibdir)/script Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 + /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 Modified: branches/0.18/src/libopenvrml/openvrml/local/conf.cpp =================================================================== --- branches/0.18/src/libopenvrml/openvrml/local/conf.cpp 2009-08-07 07:58:00 UTC (rev 3987) +++ branches/0.18/src/libopenvrml/openvrml/local/conf.cpp 2009-08-07 08:08:03 UTC (rev 3988) @@ -21,6 +21,7 @@ # include "conf.h" # include <boost/multi_index/detail/scope_guard.hpp> # include <boost/ref.hpp> +# include <boost/tokenizer.hpp> # ifdef _WIN32 # include <windows.h> # include <vector> @@ -132,10 +133,10 @@ # endif } -const std::string openvrml::local::conf::datadir() +const boost::filesystem::path openvrml::local::conf::datadir() OPENVRML_THROW2(std::runtime_error, std::bad_alloc) { - std::string result; + boost::filesystem::path result; try { result = get_env("OPENVRML_DATADIR"); } catch (const no_environment_var &) { @@ -156,25 +157,56 @@ ':'; # endif - OPENVRML_LOCAL void append_to_path(std::string & path, - const std::string & appended_part) - OPENVRML_THROW1(std::bad_alloc) - { - if (!path.empty() && !appended_part.empty()) { - path += path_separator; + struct OPENVRML_LOCAL search_path_tokenizer { + template <typename Iterator, typename Token> + bool operator()(Iterator & next, Iterator end, Token & tok) + { + while (next != end) { + if (*next == path_separator) { + ++next; + break; + } + this->tok_.push_back(*next); + ++next; + } + if (!this->tok_.empty()) { + tok = this->tok_; + this->tok_.clear(); + return true; + } + return false; } - path += appended_part; - } + + void reset() + { + this->tok_.clear(); + } + + private: + std::string tok_; + }; } -const std::string openvrml::local::conf::node_path() +const std::vector<boost::filesystem::path> openvrml::local::conf::node_path() OPENVRML_THROW2(std::runtime_error, std::bad_alloc) { + using std::back_inserter; + using std::copy; + using boost::filesystem::path; + typedef boost::tokenizer<search_path_tokenizer> tokenizer_t; + + std::vector<path> result; + search_path_tokenizer tokenizer_func; + std::string env_path; try { env_path = get_env("OPENVRML_NODE_PATH"); } catch (const no_environment_var &) {} + tokenizer_t env_path_tokenizer(env_path, tokenizer_func); + copy(env_path_tokenizer.begin(), env_path_tokenizer.end(), + back_inserter(result)); + std::string system_path; # ifdef _WIN32 try { @@ -184,19 +216,33 @@ system_path = OPENVRML_PKGLIBDIR_ "/node"; # endif - std::string result = env_path; - append_to_path(result, system_path); + tokenizer_t system_path_tokenizer(system_path, tokenizer_func); + copy(system_path_tokenizer.begin(), system_path_tokenizer.end(), + back_inserter(result)); + return result; } -const std::string openvrml::local::conf::script_path() +const std::vector<boost::filesystem::path> openvrml::local::conf::script_path() OPENVRML_THROW2(std::runtime_error, std::bad_alloc) { + using std::back_inserter; + using std::copy; + using boost::filesystem::path; + typedef boost::tokenizer<search_path_tokenizer> tokenizer_t; + + std::vector<path> result; + search_path_tokenizer tokenizer_func; + std::string env_path; try { env_path = get_env("OPENVRML_SCRIPT_PATH"); } catch (const no_environment_var &) {} + tokenizer_t env_path_tokenizer(env_path, tokenizer_func); + copy(env_path_tokenizer.begin(), env_path_tokenizer.end(), + back_inserter(result)); + std::string system_path; # ifdef _WIN32 try { @@ -206,7 +252,9 @@ system_path = OPENVRML_PKGLIBDIR_ "/script"; # endif - std::string result = env_path; - append_to_path(result, system_path); + tokenizer_t system_path_tokenizer(system_path, tokenizer_func); + copy(system_path_tokenizer.begin(), system_path_tokenizer.end(), + back_inserter(result)); + return result; } Modified: branches/0.18/src/libopenvrml/openvrml/local/conf.h =================================================================== --- branches/0.18/src/libopenvrml/openvrml/local/conf.h 2009-08-07 07:58:00 UTC (rev 3987) +++ branches/0.18/src/libopenvrml/openvrml/local/conf.h 2009-08-07 08:08:03 UTC (rev 3988) @@ -22,8 +22,9 @@ # define OPENVRML_LOCAL_CONF_H # include <openvrml-common.h> +# include <boost/filesystem/path.hpp> # include <stdexcept> -# include <string> +# include <vector> namespace openvrml { @@ -31,11 +32,15 @@ namespace conf { - OPENVRML_LOCAL const std::string datadir() + OPENVRML_LOCAL const boost::filesystem::path datadir() OPENVRML_THROW2(std::runtime_error, std::bad_alloc); - OPENVRML_LOCAL const std::string node_path() + + OPENVRML_LOCAL + const std::vector<boost::filesystem::path> node_path() OPENVRML_THROW2(std::runtime_error, std::bad_alloc); - OPENVRML_LOCAL const std::string script_path() + + OPENVRML_LOCAL + const std::vector<boost::filesystem::path> script_path() OPENVRML_THROW2(std::runtime_error, std::bad_alloc); } } Modified: branches/0.18/src/libopenvrml/openvrml/local/node_metatype_registry_impl.cpp =================================================================== --- branches/0.18/src/libopenvrml/openvrml/local/node_metatype_registry_impl.cpp 2009-08-07 07:58:00 UTC (rev 3987) +++ branches/0.18/src/libopenvrml/openvrml/local/node_metatype_registry_impl.cpp 2009-08-07 08:08:03 UTC (rev 3988) @@ -27,10 +27,10 @@ using namespace boost::multi_index::detail; // for scope_guard -const char openvrml::local::node_metatype_registry_impl::sym[33] = +const std::string openvrml::local::node_metatype_registry_impl::sym = "openvrml_register_node_metatypes"; -int openvrml_open_node_module(const char * const filename, void * const data) +int openvrml_open_node_module(const std::string & filename, void * const data) { using openvrml::node_metatype_registry; using namespace openvrml::local; @@ -75,9 +75,9 @@ throw std::runtime_error("dlinit_failure"); } - const std::string node_path = conf::node_path(); + const std::vector<boost::filesystem::path> & node_path = conf::node_path(); - result = dl::foreachfile(node_path.c_str(), + result = dl::foreachfile(node_path, openvrml_open_node_module, this); assert(result == 0); // We always return 0 from the callback. Modified: branches/0.18/src/libopenvrml/openvrml/local/node_metatype_registry_impl.h =================================================================== --- branches/0.18/src/libopenvrml/openvrml/local/node_metatype_registry_impl.h 2009-08-07 07:58:00 UTC (rev 3987) +++ branches/0.18/src/libopenvrml/openvrml/local/node_metatype_registry_impl.h 2009-08-07 08:08:03 UTC (rev 3988) @@ -24,8 +24,9 @@ # include <openvrml/local/dl.h> # include <openvrml/node.h> -extern "C" OPENVRML_LOCAL int openvrml_open_node_module(const char * filename, - void * data); +extern "C" +OPENVRML_LOCAL +int openvrml_open_node_module(const std::string & filename, void * data); namespace openvrml { @@ -36,8 +37,10 @@ namespace local { class OPENVRML_LOCAL node_metatype_registry_impl : boost::noncopyable { - friend int (::openvrml_open_node_module)(const char * filename, - void * data); + friend + int (::openvrml_open_node_module)(const std::string & filename, + void * data); + mutable boost::shared_mutex mutex_; openvrml::browser & browser_; @@ -50,7 +53,7 @@ mutable node_metatype_map_t node_metatype_map_; public: - static const char sym[33]; + static const std::string sym; explicit node_metatype_registry_impl(openvrml::browser & b); ~node_metatype_registry_impl() OPENVRML_NOTHROW; Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 Modified: branches/0.18/src/libopenvrml/openvrml/script.cpp =================================================================== --- branches/0.18/src/libopenvrml/openvrml/script.cpp 2009-08-07 07:58:00 UTC (rev 3987) +++ branches/0.18/src/libopenvrml/openvrml/script.cpp 2009-08-07 08:08:03 UTC (rev 3988) @@ -361,7 +361,7 @@ * instantiate @c script_factory_registry. */ -extern "C" int openvrml_get_script_factory(const char * filename, void * data); +extern "C" int openvrml_get_script_factory(const std::string & filename, void * data); /** * @internal @@ -373,7 +373,7 @@ class openvrml::script_factory_registry::impl : boost::noncopyable { - friend int (::openvrml_get_script_factory)(const char * filename, + friend int (::openvrml_get_script_factory)(const std::string & filename, void * data); typedef std::set<local::dl::handle> module_handle_set; @@ -403,7 +403,7 @@ find_using_uri_scheme(const std::string & uri_scheme) const; }; -int openvrml_get_script_factory(const char * const filename, void * data) +int openvrml_get_script_factory(const std::string & filename, void * data) { assert(data); @@ -442,9 +442,10 @@ throw std::runtime_error("dlinit failure"); } - const std::string script_path = local::conf::script_path(); + const std::vector<boost::filesystem::path> & script_path = + local::conf::script_path(); - result = dl::foreachfile(script_path.c_str(), + result = dl::foreachfile(script_path, openvrml_get_script_factory, this); assert(result == 0); // We always return 0 from the callback. Property changes on: branches/0.18/src/libopenvrml/openvrml/script.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 Modified: branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp =================================================================== --- branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp 2009-08-07 07:58:00 UTC (rev 3987) +++ branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp 2009-08-07 08:08:03 UTC (rev 3988) @@ -23,6 +23,7 @@ # include <boost/ref.hpp> # include <boost/tokenizer.hpp> # include <boost/multi_index/detail/scope_guard.hpp> +# include <sstream> using namespace boost::multi_index::detail; // for scope_guard @@ -45,75 +46,55 @@ } namespace { - - struct OPENVRML_LOCAL win32_search_path_tokenizer { - win32_search_path_tokenizer() - {} - - template <typename Iterator, typename Token> - bool operator()(Iterator & next, Iterator end, Token & tok) - { - while (next != end) { - if (*next == ';') { - ++next; - break; - } - this->tok_.push_back(*next); - ++next; - } - if (!this->tok_.empty()) { - tok = this->tok_; - this->tok_.clear(); - return true; - } - return false; - } - - void reset() - { - this->tok_.clear(); - } - - private: - std::string tok_; + struct ltforeachfile_data { + int (*func)(const std::string & filename, void * data); + void * data; }; } +extern "C" +OPENVRML_LOCAL +int openvrml_dl_ltforeachfile(const char * filename, void * data) +{ + ltforeachfile_data * const d = static_cast<ltforeachfile_data *>(data); + return (d->func)(filename, d->data); +} + int -openvrml::local::dl::foreachfile(const char * search_path, - int (*func)(const char * filename, void * data), - void * data) +openvrml::local::dl:: +foreachfile(const std::vector<boost::filesystem::path> & search_path, + int (*func)(const std::string & filename, void * data), + void * data) { # ifdef _WIN32 using boost::filesystem::path; using boost::filesystem::directory_iterator; typedef boost::tokenizer<win32_search_path_tokenizer> tokenizer_t; - std::vector<path> search_dirs; - win32_search_path_tokenizer tokenizer_func; - std::string search_path_str(search_path); - tokenizer_t tokenizer(search_path_str, tokenizer_func); - for (tokenizer_t::const_iterator token = tokenizer.begin(); - token != tokenizer.end(); - ++token) { - search_dirs.push_back(path(*token)); - } - int result = 0; - for (std::vector<path>::const_iterator dir = search_dirs.begin(); - dir != search_dirs.end(); + for (std::vector<path>::const_iterator dir = search_path.begin(); + dir != search_path.end(); ++dir) try { - for (directory_iterator entry(*dir); - entry != directory_iterator(); - ++entry) { - result = (func)(entry->path().external_file_string().c_str(), - data); - if (result != 0) { return result; } - } - } catch (boost::filesystem::filesystem_error &) {} + for (directory_iterator entry(*dir); + entry != directory_iterator(); + ++entry) { + result = (func)(entry->path().external_file_string(), data); + if (result != 0) { return result; } + } + } catch (boost::filesystem::filesystem_error &) {} return result; # else - return lt_dlforeachfile(search_path, func, data); + std::ostringstream path; + std::vector<boost::filesystem::path>::const_iterator dir = + search_path.begin(); + while (dir != search_path.end()) { + path << *dir; + if (++dir != search_path.end()) { path << LT_PATHSEP_CHAR; } + } + ltforeachfile_data ltdata = { func, data }; + return lt_dlforeachfile(path.str().c_str(), + openvrml_dl_ltforeachfile, + <data); # endif } @@ -122,24 +103,26 @@ * * @brief Prepend @p dir to the dynamic library search path. */ -int openvrml::local::dl::prepend_to_searchpath(const char * const dir) +int +openvrml::local::dl::prepend_to_searchpath(const boost::filesystem::path & dir) { # ifdef _WIN32 - return SetDllDirectory(dir); + return SetDllDirectory(dir.directory_string().c_str()); # else const char * const before = lt_dlgetsearchpath(); - return lt_dlinsertsearchdir(before, dir); + return lt_dlinsertsearchdir(before, dir.directory_string().c_str()); # endif } -openvrml::local::dl::handle openvrml::local::dl::open(const char * filename) +openvrml::local::dl::handle +openvrml::local::dl::open(const std::string & filename) { # ifdef _WIN32 - const char * last_dot = strrchr(filename, '.'); - if (strcmp(last_dot, ".dll") != 0) { return 0; } - return LoadLibrary(filename); + std::string::size_type last_dot_index = filename.find_last_of('.'); + if (filename.substr(last_dot_index) != ".dll") { return 0; } + return LoadLibrary(filename.c_str()); # else - return lt_dlopenext(filename); + return lt_dlopenext(filename.c_str()); # endif } @@ -177,11 +160,11 @@ # endif } -void * openvrml::local::dl::sym(handle h, const char * name) +void * openvrml::local::dl::sym(handle h, const std::string & name) { # ifdef _WIN32 - return GetProcAddress(h, name); + return GetProcAddress(h, name.c_str()); # else - return lt_dlsym(h, name); + return lt_dlsym(h, name.c_str()); # endif } Modified: branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.h =================================================================== --- branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.h 2009-08-07 07:58:00 UTC (rev 3987) +++ branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.h 2009-08-07 08:08:03 UTC (rev 3988) @@ -27,7 +27,9 @@ # else # include <ltdl.h> # endif +# include <boost/filesystem/path.hpp> # include <string> +# include <vector> namespace openvrml { @@ -40,11 +42,14 @@ OPENVRML_LOCAL int exit(); OPENVRML_LOCAL - int foreachfile(const char * search_path, - int (*func)(const char * filename, void * data), - void * data); + int + foreachfile( + const std::vector<boost::filesystem::path> & search_path, + int (*func)(const std::string & filename, void * data), + void * data); - OPENVRML_LOCAL int prepend_to_searchpath(const char * dir); + OPENVRML_LOCAL + int prepend_to_searchpath(const boost::filesystem::path & dir); # ifdef _WIN32 typedef HMODULE handle; @@ -52,13 +57,13 @@ typedef lt_dlhandle handle; # endif - OPENVRML_LOCAL handle open(const char * filename); + OPENVRML_LOCAL handle open(const std::string & filename); OPENVRML_LOCAL const std::string error(); OPENVRML_LOCAL int close(handle); - OPENVRML_LOCAL void * sym(handle, const char * name); + OPENVRML_LOCAL void * sym(handle, const std::string & name); } } } Property changes on: branches/0.18/src/mozilla-plugin ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 + /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 Property changes on: branches/0.18/src/node/vrml97/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 + /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 Property changes on: branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 + /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 + /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 + /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 + /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 + /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 + /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 + /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 + /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 + /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 + /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 + /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 Property changes on: branches/0.18/src/node/x3d-core/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 + /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 + /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 + /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 + /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 + /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 Property changes on: branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 + /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 + /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985 + /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/si... [truncated message content] |
From: <br...@us...> - 2009-08-08 01:55:24
|
Revision: 3990 http://openvrml.svn.sourceforge.net/openvrml/?rev=3990&view=rev Author: braden Date: 2009-08-08 01:55:16 +0000 (Sat, 08 Aug 2009) Log Message: ----------- Fixes for building on Windows. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp Property Changed: ---------------- branches/0.18/ branches/0.18/src/libopenvrml/openvrml/bad_url.cpp branches/0.18/src/libopenvrml/openvrml/bad_url.h branches/0.18/src/libopenvrml/openvrml/local/proto.cpp branches/0.18/src/libopenvrml/openvrml/local/proto.h branches/0.18/src/libopenvrml/openvrml/scene.cpp branches/0.18/src/libopenvrml/openvrml/scene.h branches/0.18/src/libopenvrml/openvrml/script.cpp branches/0.18/src/mozilla-plugin/ branches/0.18/src/node/vrml97/register_node_metatypes.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.h branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp branches/0.18/src/node/x3d-core/metadata_double.cpp branches/0.18/src/node/x3d-core/metadata_double.h branches/0.18/src/node/x3d-core/metadata_float.cpp branches/0.18/src/node/x3d-core/metadata_float.h branches/0.18/src/node/x3d-core/metadata_integer.cpp branches/0.18/src/node/x3d-core/metadata_integer.h branches/0.18/src/node/x3d-core/metadata_set.cpp branches/0.18/src/node/x3d-core/metadata_set.h branches/0.18/src/node/x3d-core/metadata_string.cpp branches/0.18/src/node/x3d-core/metadata_string.h branches/0.18/src/node/x3d-core/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/espdu_transform.cpp branches/0.18/src/node/x3d-dis/espdu_transform.h branches/0.18/src/node/x3d-dis/receiver_pdu.cpp branches/0.18/src/node/x3d-dis/receiver_pdu.h branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/signal_pdu.cpp branches/0.18/src/node/x3d-dis/signal_pdu.h branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp branches/0.18/src/node/x3d-dis/transmitter_pdu.h branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.h branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp branches/0.18/src/node/x3d-event-utilities/boolean_filter.h branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp branches/0.18/src/node/x3d-event-utilities/integer_trigger.h branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.h branches/0.18/src/node/x3d-geometry2d/arc2d.cpp branches/0.18/src/node/x3d-geometry2d/arc2d.h branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp branches/0.18/src/node/x3d-geometry2d/arc_close2d.h branches/0.18/src/node/x3d-geometry2d/circle2d.cpp branches/0.18/src/node/x3d-geometry2d/circle2d.h branches/0.18/src/node/x3d-geometry2d/disk2d.cpp branches/0.18/src/node/x3d-geometry2d/disk2d.h branches/0.18/src/node/x3d-geometry2d/polyline2d.cpp branches/0.18/src/node/x3d-geometry2d/polyline2d.h branches/0.18/src/node/x3d-geometry2d/polypoint2d.cpp branches/0.18/src/node/x3d-geometry2d/polypoint2d.h branches/0.18/src/node/x3d-geometry2d/rectangle2d.cpp branches/0.18/src/node/x3d-geometry2d/rectangle2d.h branches/0.18/src/node/x3d-geometry2d/register_node_metatypes.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.h branches/0.18/src/node/x3d-geospatial/geo_coordinate.cpp branches/0.18/src/node/x3d-geospatial/geo_coordinate.h branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.cpp branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.h branches/0.18/src/node/x3d-geospatial/geo_location.cpp branches/0.18/src/node/x3d-geospatial/geo_location.h branches/0.18/src/node/x3d-geospatial/geo_lod.cpp branches/0.18/src/node/x3d-geospatial/geo_lod.h branches/0.18/src/node/x3d-geospatial/geo_metadata.cpp branches/0.18/src/node/x3d-geospatial/geo_metadata.h branches/0.18/src/node/x3d-geospatial/geo_origin.cpp branches/0.18/src/node/x3d-geospatial/geo_origin.h branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.cpp branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.h branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.cpp branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.h branches/0.18/src/node/x3d-geospatial/geo_viewpoint.cpp branches/0.18/src/node/x3d-geospatial/geo_viewpoint.h branches/0.18/src/node/x3d-geospatial/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/static_group.cpp branches/0.18/src/node/x3d-grouping/static_group.h branches/0.18/src/node/x3d-h-anim/h_anim_displacer.cpp branches/0.18/src/node/x3d-h-anim/h_anim_displacer.h branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.cpp branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.h branches/0.18/src/node/x3d-h-anim/h_anim_joint.cpp branches/0.18/src/node/x3d-h-anim/h_anim_joint.h branches/0.18/src/node/x3d-h-anim/h_anim_segment.cpp branches/0.18/src/node/x3d-h-anim/h_anim_segment.h branches/0.18/src/node/x3d-h-anim/h_anim_site.cpp branches/0.18/src/node/x3d-h-anim/h_anim_site.h branches/0.18/src/node/x3d-h-anim/register_node_metatypes.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.h branches/0.18/src/node/x3d-interpolation/position_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/position_interpolator2d.h branches/0.18/src/node/x3d-interpolation/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.h branches/0.18/src/node/x3d-key-device-sensor/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.h branches/0.18/src/node/x3d-networking/load_sensor.cpp branches/0.18/src/node/x3d-networking/load_sensor.h branches/0.18/src/node/x3d-networking/register_node_metatypes.cpp branches/0.18/src/node/x3d-nurbs/contour2d.cpp branches/0.18/src/node/x3d-nurbs/contour2d.h branches/0.18/src/node/x3d-nurbs/contour_polyline2d.cpp branches/0.18/src/node/x3d-nurbs/contour_polyline2d.h branches/0.18/src/node/x3d-nurbs/coordinate_double.cpp branches/0.18/src/node/x3d-nurbs/coordinate_double.h branches/0.18/src/node/x3d-nurbs/nurbs_curve.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve.h branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.h branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_set.cpp branches/0.18/src/node/x3d-nurbs/nurbs_set.h branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.h branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.h branches/0.18/src/node/x3d-nurbs/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/color_rgba.cpp branches/0.18/src/node/x3d-rendering/color_rgba.h branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.h branches/0.18/src/node/x3d-rendering/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.h branches/0.18/src/node/x3d-rendering/triangle_set.cpp branches/0.18/src/node/x3d-rendering/triangle_set.h branches/0.18/src/node/x3d-rendering/triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/triangle_strip_set.h branches/0.18/src/node/x3d-shape/fill_properties.cpp branches/0.18/src/node/x3d-shape/fill_properties.h branches/0.18/src/node/x3d-shape/line_properties.cpp branches/0.18/src/node/x3d-shape/line_properties.h branches/0.18/src/node/x3d-shape/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/multi_texture.cpp branches/0.18/src/node/x3d-texturing/multi_texture.h branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.cpp branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.h branches/0.18/src/node/x3d-texturing/multi_texture_transform.cpp branches/0.18/src/node/x3d-texturing/multi_texture_transform.h branches/0.18/src/node/x3d-texturing/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.h Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2009-08-08 00:29:19 UTC (rev 3989) +++ branches/0.18/ChangeLog 2009-08-08 01:55:16 UTC (rev 3990) @@ -1,5 +1,16 @@ 2009-08-07 Braden McDaniel <br...@en...> + Fixes for building on Windows. + + * src/local/libopenvrml-dl/openvrml/local/dl.cpp + (openvrml::local::dl::foreachfile(const + std::vector<boost::filesystem::path> &, int (*)(const + std::string&, void *), void *)): Removed obsolete typedef. + * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj: + Added libopenvrml-dl source directory to include path. + +2009-08-07 Braden McDaniel <br...@en...> + Modified openvrml::local::dl interface to use boost::filesystem::path and std::string. Modified: branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj =================================================================== --- branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj 2009-08-08 00:29:19 UTC (rev 3989) +++ branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj 2009-08-08 01:55:16 UTC (rev 3990) @@ -41,7 +41,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml" + AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\src\local\libopenvrml-dl" PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION=\"0.18.2\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\"\";OPENVRML_PKGLIBDIR_=\"\"" MinimalRebuild="false" BasicRuntimeChecks="0" @@ -126,7 +126,7 @@ Optimization="3" InlineFunctionExpansion="1" OmitFramePointers="true" - AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml" + AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\src\local\libopenvrml-dl" PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;PACKAGE_VERSION=\"0.18.2\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\"\";OPENVRML_PKGLIBDIR_=\"\";NDEBUG" StringPooling="true" RuntimeLibrary="2" Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/libopenvrml/openvrml/script.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Modified: branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp =================================================================== --- branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp 2009-08-08 00:29:19 UTC (rev 3989) +++ branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp 2009-08-08 01:55:16 UTC (rev 3990) @@ -69,7 +69,6 @@ # ifdef _WIN32 using boost::filesystem::path; using boost::filesystem::directory_iterator; - typedef boost::tokenizer<win32_search_path_tokenizer> tokenizer_t; int result = 0; for (std::vector<path>::const_iterator dir = search_path.begin(); Property changes on: branches/0.18/src/mozilla-plugin ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/vrml97/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-core/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-dis/transmitter_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 /trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 /trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-environmental-effects/texture_background.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_filter.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/local/src/node/x3d-event-utilities/integer_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3734 /trunk/src/node/x3d-event-utilities/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987 + /branches/0.17/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3734 /trunk/src/node/x3d-event-utilities/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 Property changes on: branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/time_trigger.cpp:3677-3689 /branches/node-module... [truncated message content] |
From: <br...@us...> - 2009-08-11 04:06:01
|
Revision: 3992 http://openvrml.svn.sourceforge.net/openvrml/?rev=3992&view=rev Author: braden Date: 2009-08-11 04:05:52 +0000 (Tue, 11 Aug 2009) Log Message: ----------- Removed obsolete include of <boost/concept_check.hpp>. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/src/libopenvrml/openvrml/local/float.h Property Changed: ---------------- branches/0.18/ branches/0.18/src/libopenvrml/openvrml/bad_url.cpp branches/0.18/src/libopenvrml/openvrml/bad_url.h branches/0.18/src/libopenvrml/openvrml/local/proto.cpp branches/0.18/src/libopenvrml/openvrml/local/proto.h branches/0.18/src/libopenvrml/openvrml/scene.cpp branches/0.18/src/libopenvrml/openvrml/scene.h branches/0.18/src/libopenvrml/openvrml/script.cpp branches/0.18/src/mozilla-plugin/ branches/0.18/src/node/vrml97/register_node_metatypes.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.h branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp branches/0.18/src/node/x3d-core/metadata_double.cpp branches/0.18/src/node/x3d-core/metadata_double.h branches/0.18/src/node/x3d-core/metadata_float.cpp branches/0.18/src/node/x3d-core/metadata_float.h branches/0.18/src/node/x3d-core/metadata_integer.cpp branches/0.18/src/node/x3d-core/metadata_integer.h branches/0.18/src/node/x3d-core/metadata_set.cpp branches/0.18/src/node/x3d-core/metadata_set.h branches/0.18/src/node/x3d-core/metadata_string.cpp branches/0.18/src/node/x3d-core/metadata_string.h branches/0.18/src/node/x3d-core/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/espdu_transform.cpp branches/0.18/src/node/x3d-dis/espdu_transform.h branches/0.18/src/node/x3d-dis/receiver_pdu.cpp branches/0.18/src/node/x3d-dis/receiver_pdu.h branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/signal_pdu.cpp branches/0.18/src/node/x3d-dis/signal_pdu.h branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp branches/0.18/src/node/x3d-dis/transmitter_pdu.h branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.h branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp branches/0.18/src/node/x3d-event-utilities/boolean_filter.h branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp branches/0.18/src/node/x3d-event-utilities/integer_trigger.h branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.h branches/0.18/src/node/x3d-geometry2d/arc2d.cpp branches/0.18/src/node/x3d-geometry2d/arc2d.h branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp branches/0.18/src/node/x3d-geometry2d/arc_close2d.h branches/0.18/src/node/x3d-geometry2d/circle2d.cpp branches/0.18/src/node/x3d-geometry2d/circle2d.h branches/0.18/src/node/x3d-geometry2d/disk2d.cpp branches/0.18/src/node/x3d-geometry2d/disk2d.h branches/0.18/src/node/x3d-geometry2d/polyline2d.cpp branches/0.18/src/node/x3d-geometry2d/polyline2d.h branches/0.18/src/node/x3d-geometry2d/polypoint2d.cpp branches/0.18/src/node/x3d-geometry2d/polypoint2d.h branches/0.18/src/node/x3d-geometry2d/rectangle2d.cpp branches/0.18/src/node/x3d-geometry2d/rectangle2d.h branches/0.18/src/node/x3d-geometry2d/register_node_metatypes.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.h branches/0.18/src/node/x3d-geospatial/geo_coordinate.cpp branches/0.18/src/node/x3d-geospatial/geo_coordinate.h branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.cpp branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.h branches/0.18/src/node/x3d-geospatial/geo_location.cpp branches/0.18/src/node/x3d-geospatial/geo_location.h branches/0.18/src/node/x3d-geospatial/geo_lod.cpp branches/0.18/src/node/x3d-geospatial/geo_lod.h branches/0.18/src/node/x3d-geospatial/geo_metadata.cpp branches/0.18/src/node/x3d-geospatial/geo_metadata.h branches/0.18/src/node/x3d-geospatial/geo_origin.cpp branches/0.18/src/node/x3d-geospatial/geo_origin.h branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.cpp branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.h branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.cpp branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.h branches/0.18/src/node/x3d-geospatial/geo_viewpoint.cpp branches/0.18/src/node/x3d-geospatial/geo_viewpoint.h branches/0.18/src/node/x3d-geospatial/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/static_group.cpp branches/0.18/src/node/x3d-grouping/static_group.h branches/0.18/src/node/x3d-h-anim/h_anim_displacer.cpp branches/0.18/src/node/x3d-h-anim/h_anim_displacer.h branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.cpp branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.h branches/0.18/src/node/x3d-h-anim/h_anim_joint.cpp branches/0.18/src/node/x3d-h-anim/h_anim_joint.h branches/0.18/src/node/x3d-h-anim/h_anim_segment.cpp branches/0.18/src/node/x3d-h-anim/h_anim_segment.h branches/0.18/src/node/x3d-h-anim/h_anim_site.cpp branches/0.18/src/node/x3d-h-anim/h_anim_site.h branches/0.18/src/node/x3d-h-anim/register_node_metatypes.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.h branches/0.18/src/node/x3d-interpolation/position_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/position_interpolator2d.h branches/0.18/src/node/x3d-interpolation/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.h branches/0.18/src/node/x3d-key-device-sensor/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.h branches/0.18/src/node/x3d-networking/load_sensor.cpp branches/0.18/src/node/x3d-networking/load_sensor.h branches/0.18/src/node/x3d-networking/register_node_metatypes.cpp branches/0.18/src/node/x3d-nurbs/contour2d.cpp branches/0.18/src/node/x3d-nurbs/contour2d.h branches/0.18/src/node/x3d-nurbs/contour_polyline2d.cpp branches/0.18/src/node/x3d-nurbs/contour_polyline2d.h branches/0.18/src/node/x3d-nurbs/coordinate_double.cpp branches/0.18/src/node/x3d-nurbs/coordinate_double.h branches/0.18/src/node/x3d-nurbs/nurbs_curve.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve.h branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.h branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_set.cpp branches/0.18/src/node/x3d-nurbs/nurbs_set.h branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.h branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.h branches/0.18/src/node/x3d-nurbs/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/color_rgba.cpp branches/0.18/src/node/x3d-rendering/color_rgba.h branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.h branches/0.18/src/node/x3d-rendering/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.h branches/0.18/src/node/x3d-rendering/triangle_set.cpp branches/0.18/src/node/x3d-rendering/triangle_set.h branches/0.18/src/node/x3d-rendering/triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/triangle_strip_set.h branches/0.18/src/node/x3d-shape/fill_properties.cpp branches/0.18/src/node/x3d-shape/fill_properties.h branches/0.18/src/node/x3d-shape/line_properties.cpp branches/0.18/src/node/x3d-shape/line_properties.h branches/0.18/src/node/x3d-shape/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/multi_texture.cpp branches/0.18/src/node/x3d-texturing/multi_texture.h branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.cpp branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.h branches/0.18/src/node/x3d-texturing/multi_texture_transform.cpp branches/0.18/src/node/x3d-texturing/multi_texture_transform.h branches/0.18/src/node/x3d-texturing/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.h Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2009-08-11 03:55:57 UTC (rev 3991) +++ branches/0.18/ChangeLog 2009-08-11 04:05:52 UTC (rev 3992) @@ -1,3 +1,8 @@ +2009-08-10 Braden McDaniel <br...@en...> + + * src/libopenvrml/openvrml/local/float.h: Removed obsolete include + of <boost/concept_check.hpp>. + 2009-08-07 Braden McDaniel <br...@en...> Fixes for building on Windows. Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Modified: branches/0.18/src/libopenvrml/openvrml/local/float.h =================================================================== --- branches/0.18/src/libopenvrml/openvrml/local/float.h 2009-08-11 03:55:57 UTC (rev 3991) +++ branches/0.18/src/libopenvrml/openvrml/local/float.h 2009-08-11 04:05:52 UTC (rev 3992) @@ -23,7 +23,6 @@ # include <openvrml-common.h> # include <limits> -# include <boost/concept_check.hpp> namespace openvrml { Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/libopenvrml/openvrml/script.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/mozilla-plugin ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/vrml97/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-core/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-dis/transmitter_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 /trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 /trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-environmental-effects/texture_background.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_filter.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/local/src/node/x3d-event-utilities/integer_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3734 /trunk/src/node/x3d-event-utilities/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/0.17/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3734 /trunk/src/node/x3d-event-utilities/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/time_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/time_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/local/src/node/x3d-event-utilities/time_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/time_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 Property changes on: branches/0.18/src/node/x3d-event-utilities/time_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/time_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/time_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989 + /branches/local/src/node/x3d-event-utilities/time_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/time_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 ... [truncated message content] |
From: <br...@us...> - 2009-08-13 06:31:47
|
Revision: 3994 http://openvrml.svn.sourceforge.net/openvrml/?rev=3994&view=rev Author: braden Date: 2009-08-13 06:31:41 +0000 (Thu, 13 Aug 2009) Log Message: ----------- Updates for 0.18.3 release. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/NEWS branches/0.18/README branches/0.18/configure.ac branches/0.18/doc/Doxyfile branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc branches/0.18/src/Makefile.am Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2009-08-12 03:48:23 UTC (rev 3993) +++ branches/0.18/ChangeLog 2009-08-13 06:31:41 UTC (rev 3994) @@ -1,3 +1,16 @@ +2009-08-13 Braden McDaniel <br...@en...> + + Updates for 0.18.3 release. + + * README + * NEWS + * configure.ac + * doc/Doxyfile + * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc + * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj + * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc + * src/Makefile.am: Updated libopenvrml library version to 9:2:0. + 2009-08-10 Braden McDaniel <br...@en...> * src/libopenvrml/openvrml/local/float.h: Removed obsolete include Modified: branches/0.18/NEWS =================================================================== --- branches/0.18/NEWS 2009-08-12 03:48:23 UTC (rev 3993) +++ branches/0.18/NEWS 2009-08-13 06:31:41 UTC (rev 3994) @@ -1,3 +1,9 @@ +Changes new in version 0.18.3, 13 August, 2009 +======================================================================== + +- Fixes for building on Windows. + + Changes new in version 0.18.2, 7 July, 2009 ======================================================================== Modified: branches/0.18/README =================================================================== --- branches/0.18/README 2009-08-12 03:48:23 UTC (rev 3993) +++ branches/0.18/README 2009-08-13 06:31:41 UTC (rev 3994) @@ -1,4 +1,4 @@ -OpenVRML library version 0.18.2 +OpenVRML library version 0.18.3 Copyright 1998, 1999, 2000 Chris Morley <cm...@ve...> Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Braden McDaniel <br...@en...> Modified: branches/0.18/configure.ac =================================================================== --- branches/0.18/configure.ac 2009-08-12 03:48:23 UTC (rev 3993) +++ branches/0.18/configure.ac 2009-08-13 06:31:41 UTC (rev 3994) @@ -1,4 +1,4 @@ -AC_INIT([OpenVRML], [0.18.2], [ope...@li...]) +AC_INIT([OpenVRML], [0.18.3], [ope...@li...]) AC_PREREQ([2.59]) AC_COPYRIGHT([Portions copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Braden McDaniel]) AC_CONFIG_MACRO_DIR([m4]) Modified: branches/0.18/doc/Doxyfile =================================================================== --- branches/0.18/doc/Doxyfile 2009-08-12 03:48:23 UTC (rev 3993) +++ branches/0.18/doc/Doxyfile 2009-08-13 06:31:41 UTC (rev 3994) @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = OpenVRML -PROJECT_NUMBER = 0.18.2 +PROJECT_NUMBER = 0.18.3 OUTPUT_DIRECTORY = CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English Modified: branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc =================================================================== --- branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc 2009-08-12 03:48:23 UTC (rev 3993) +++ branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc 2009-08-13 06:31:41 UTC (rev 3994) @@ -11,8 +11,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 9,1,0,0 - PRODUCTVERSION 0,18,2,0 + FILEVERSION 9,2,0,0 + PRODUCTVERSION 0,18,3,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -28,12 +28,12 @@ BLOCK "040904b0" BEGIN VALUE "FileDescription", "OpenVRML Library" - VALUE "FileVersion", "9, 1, 0, 0" + VALUE "FileVersion", "9, 2, 0, 0" VALUE "InternalName", "openvrml" VALUE "LegalCopyright", "Copyright (C) 2009" VALUE "OriginalFilename", "openvrml.dll" VALUE "ProductName", "OpenVRML Library" - VALUE "ProductVersion", "0.18.2" + VALUE "ProductVersion", "0.18.3" END END BLOCK "VarFileInfo" Modified: branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj =================================================================== --- branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj 2009-08-12 03:48:23 UTC (rev 3993) +++ branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj 2009-08-13 06:31:41 UTC (rev 3994) @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\src\local\libopenvrml-dl" - PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION=\"0.18.2\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\"\";OPENVRML_PKGLIBDIR_=\"\"" + PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION=\"0.18.3\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\"\";OPENVRML_PKGLIBDIR_=\"\"" MinimalRebuild="false" BasicRuntimeChecks="0" RuntimeLibrary="3" @@ -127,7 +127,7 @@ InlineFunctionExpansion="1" OmitFramePointers="true" AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\src\local\libopenvrml-dl" - PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;PACKAGE_VERSION=\"0.18.2\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\"\";OPENVRML_PKGLIBDIR_=\"\";NDEBUG" + PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;PACKAGE_VERSION=\"0.18.3\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\"\";OPENVRML_PKGLIBDIR_=\"\";NDEBUG" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" Modified: branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc =================================================================== --- branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc 2009-08-12 03:48:23 UTC (rev 3993) +++ branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc 2009-08-13 06:31:41 UTC (rev 3994) @@ -12,7 +12,7 @@ VS_VERSION_INFO VERSIONINFO FILEVERSION 8,0,0,0 - PRODUCTVERSION 0,18,2,0 + PRODUCTVERSION 0,18,3,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -33,7 +33,7 @@ VALUE "LegalCopyright", "Copyright (C) 2009" VALUE "OriginalFilename", "openvrml-gl.dll" VALUE "ProductName", "OpenVRML Library" - VALUE "ProductVersion", "0.18.2" + VALUE "ProductVersion", "0.18.3" END END BLOCK "VarFileInfo" Modified: branches/0.18/src/Makefile.am =================================================================== --- branches/0.18/src/Makefile.am 2009-08-12 03:48:23 UTC (rev 3993) +++ branches/0.18/src/Makefile.am 2009-08-13 06:31:41 UTC (rev 3994) @@ -47,7 +47,7 @@ libopenvrml/private.h \ openvrml-player/filechooserdialog.h -LIBOPENVRML_LIBRARY_VERSION = 9:1:0 +LIBOPENVRML_LIBRARY_VERSION = 9:2:0 LIBOPENVRML_GL_LIBRARY_VERSION = 8:0:0 # | | | # +------+ | +---+ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2009-10-05 07:21:27
|
Revision: 3998 http://openvrml.svn.sourceforge.net/openvrml/?rev=3998&view=rev Author: braden Date: 2009-10-05 07:21:09 +0000 (Mon, 05 Oct 2009) Log Message: ----------- Added openvrml-dl.vcproj to the distribution. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/ide-projects/Makefile.am Property Changed: ---------------- branches/0.18/ branches/0.18/src/libopenvrml/openvrml/bad_url.cpp branches/0.18/src/libopenvrml/openvrml/bad_url.h branches/0.18/src/libopenvrml/openvrml/local/proto.cpp branches/0.18/src/libopenvrml/openvrml/local/proto.h branches/0.18/src/libopenvrml/openvrml/scene.cpp branches/0.18/src/libopenvrml/openvrml/scene.h branches/0.18/src/libopenvrml/openvrml/script.cpp branches/0.18/src/mozilla-plugin/ branches/0.18/src/node/vrml97/register_node_metatypes.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.h branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp branches/0.18/src/node/x3d-core/metadata_double.cpp branches/0.18/src/node/x3d-core/metadata_double.h branches/0.18/src/node/x3d-core/metadata_float.cpp branches/0.18/src/node/x3d-core/metadata_float.h branches/0.18/src/node/x3d-core/metadata_integer.cpp branches/0.18/src/node/x3d-core/metadata_integer.h branches/0.18/src/node/x3d-core/metadata_set.cpp branches/0.18/src/node/x3d-core/metadata_set.h branches/0.18/src/node/x3d-core/metadata_string.cpp branches/0.18/src/node/x3d-core/metadata_string.h branches/0.18/src/node/x3d-core/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/espdu_transform.cpp branches/0.18/src/node/x3d-dis/espdu_transform.h branches/0.18/src/node/x3d-dis/receiver_pdu.cpp branches/0.18/src/node/x3d-dis/receiver_pdu.h branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/signal_pdu.cpp branches/0.18/src/node/x3d-dis/signal_pdu.h branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp branches/0.18/src/node/x3d-dis/transmitter_pdu.h branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.h branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp branches/0.18/src/node/x3d-event-utilities/boolean_filter.h branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp branches/0.18/src/node/x3d-event-utilities/integer_trigger.h branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.h branches/0.18/src/node/x3d-geometry2d/arc2d.cpp branches/0.18/src/node/x3d-geometry2d/arc2d.h branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp branches/0.18/src/node/x3d-geometry2d/arc_close2d.h branches/0.18/src/node/x3d-geometry2d/circle2d.cpp branches/0.18/src/node/x3d-geometry2d/circle2d.h branches/0.18/src/node/x3d-geometry2d/disk2d.cpp branches/0.18/src/node/x3d-geometry2d/disk2d.h branches/0.18/src/node/x3d-geometry2d/polyline2d.cpp branches/0.18/src/node/x3d-geometry2d/polyline2d.h branches/0.18/src/node/x3d-geometry2d/polypoint2d.cpp branches/0.18/src/node/x3d-geometry2d/polypoint2d.h branches/0.18/src/node/x3d-geometry2d/rectangle2d.cpp branches/0.18/src/node/x3d-geometry2d/rectangle2d.h branches/0.18/src/node/x3d-geometry2d/register_node_metatypes.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.h branches/0.18/src/node/x3d-geospatial/geo_coordinate.cpp branches/0.18/src/node/x3d-geospatial/geo_coordinate.h branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.cpp branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.h branches/0.18/src/node/x3d-geospatial/geo_location.cpp branches/0.18/src/node/x3d-geospatial/geo_location.h branches/0.18/src/node/x3d-geospatial/geo_lod.cpp branches/0.18/src/node/x3d-geospatial/geo_lod.h branches/0.18/src/node/x3d-geospatial/geo_metadata.cpp branches/0.18/src/node/x3d-geospatial/geo_metadata.h branches/0.18/src/node/x3d-geospatial/geo_origin.cpp branches/0.18/src/node/x3d-geospatial/geo_origin.h branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.cpp branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.h branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.cpp branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.h branches/0.18/src/node/x3d-geospatial/geo_viewpoint.cpp branches/0.18/src/node/x3d-geospatial/geo_viewpoint.h branches/0.18/src/node/x3d-geospatial/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/static_group.cpp branches/0.18/src/node/x3d-grouping/static_group.h branches/0.18/src/node/x3d-h-anim/h_anim_displacer.cpp branches/0.18/src/node/x3d-h-anim/h_anim_displacer.h branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.cpp branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.h branches/0.18/src/node/x3d-h-anim/h_anim_joint.cpp branches/0.18/src/node/x3d-h-anim/h_anim_joint.h branches/0.18/src/node/x3d-h-anim/h_anim_segment.cpp branches/0.18/src/node/x3d-h-anim/h_anim_segment.h branches/0.18/src/node/x3d-h-anim/h_anim_site.cpp branches/0.18/src/node/x3d-h-anim/h_anim_site.h branches/0.18/src/node/x3d-h-anim/register_node_metatypes.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.h branches/0.18/src/node/x3d-interpolation/position_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/position_interpolator2d.h branches/0.18/src/node/x3d-interpolation/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.h branches/0.18/src/node/x3d-key-device-sensor/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.h branches/0.18/src/node/x3d-networking/load_sensor.cpp branches/0.18/src/node/x3d-networking/load_sensor.h branches/0.18/src/node/x3d-networking/register_node_metatypes.cpp branches/0.18/src/node/x3d-nurbs/contour2d.cpp branches/0.18/src/node/x3d-nurbs/contour2d.h branches/0.18/src/node/x3d-nurbs/contour_polyline2d.cpp branches/0.18/src/node/x3d-nurbs/contour_polyline2d.h branches/0.18/src/node/x3d-nurbs/coordinate_double.cpp branches/0.18/src/node/x3d-nurbs/coordinate_double.h branches/0.18/src/node/x3d-nurbs/nurbs_curve.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve.h branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.h branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_set.cpp branches/0.18/src/node/x3d-nurbs/nurbs_set.h branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.h branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.h branches/0.18/src/node/x3d-nurbs/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/color_rgba.cpp branches/0.18/src/node/x3d-rendering/color_rgba.h branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.h branches/0.18/src/node/x3d-rendering/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.h branches/0.18/src/node/x3d-rendering/triangle_set.cpp branches/0.18/src/node/x3d-rendering/triangle_set.h branches/0.18/src/node/x3d-rendering/triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/triangle_strip_set.h branches/0.18/src/node/x3d-shape/fill_properties.cpp branches/0.18/src/node/x3d-shape/fill_properties.h branches/0.18/src/node/x3d-shape/line_properties.cpp branches/0.18/src/node/x3d-shape/line_properties.h branches/0.18/src/node/x3d-shape/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/multi_texture.cpp branches/0.18/src/node/x3d-texturing/multi_texture.h branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.cpp branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.h branches/0.18/src/node/x3d-texturing/multi_texture_transform.cpp branches/0.18/src/node/x3d-texturing/multi_texture_transform.h branches/0.18/src/node/x3d-texturing/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.h Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2009-10-05 06:59:53 UTC (rev 3997) +++ branches/0.18/ChangeLog 2009-10-05 07:21:09 UTC (rev 3998) @@ -1,3 +1,8 @@ +2009-10-05 Braden McDaniel <br...@en...> + + * Makefile.am (VISUALC9_0_FILES): Added openvrml-dl.vcproj to the + distribution. + 2009-08-13 Braden McDaniel <br...@en...> Updates for 0.18.3 release. Modified: branches/0.18/ide-projects/Makefile.am =================================================================== --- branches/0.18/ide-projects/Makefile.am 2009-10-05 06:59:53 UTC (rev 3997) +++ branches/0.18/ide-projects/Makefile.am 2009-10-05 07:21:09 UTC (rev 3998) @@ -4,6 +4,7 @@ Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj \ Windows/VisualC9_0/OpenVRML/openvrml/openvrml-config.h \ Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc \ + Windows/VisualC9_0/OpenVRML/openvrml-dl/openvrml-dl.vcproj \ Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.vcproj \ Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl-config.h \ Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc \ Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/libopenvrml/openvrml/script.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/mozilla-plugin ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/vrml97/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-core/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-dis/transmitter_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 /trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 /trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-environmental-effects/texture_background.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_filter.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/local/src/node/x3d-event-utilities/integer_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3734 /trunk/src/node/x3d-event-utilities/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/0.17/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3734 /trunk/src/node/x3d-event-utilities/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/time_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/time_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991 + /branches/local/src/node/x3d-event-utilities/time_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/time_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 Property changes on: branches/0.18/src/node/x3d-event-utilities/time_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src... [truncated message content] |
From: <br...@us...> - 2009-10-19 02:11:06
|
Revision: 4000 http://openvrml.svn.sourceforge.net/openvrml/?rev=4000&view=rev Author: braden Date: 2009-10-19 02:10:57 +0000 (Mon, 19 Oct 2009) Log Message: ----------- Make throw_runtime_error_from_win32_system_error available to other translation units. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/src/Makefile.am branches/0.18/src/libopenvrml/openvrml/local/conf.cpp Added Paths: ----------- branches/0.18/src/libopenvrml/openvrml/local/error.cpp branches/0.18/src/libopenvrml/openvrml/local/error.h Property Changed: ---------------- branches/0.18/ branches/0.18/src/libopenvrml/openvrml/bad_url.cpp branches/0.18/src/libopenvrml/openvrml/bad_url.h branches/0.18/src/libopenvrml/openvrml/local/proto.cpp branches/0.18/src/libopenvrml/openvrml/local/proto.h branches/0.18/src/libopenvrml/openvrml/scene.cpp branches/0.18/src/libopenvrml/openvrml/scene.h branches/0.18/src/libopenvrml/openvrml/script.cpp branches/0.18/src/mozilla-plugin/ branches/0.18/src/node/vrml97/register_node_metatypes.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.h branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp branches/0.18/src/node/x3d-core/metadata_double.cpp branches/0.18/src/node/x3d-core/metadata_double.h branches/0.18/src/node/x3d-core/metadata_float.cpp branches/0.18/src/node/x3d-core/metadata_float.h branches/0.18/src/node/x3d-core/metadata_integer.cpp branches/0.18/src/node/x3d-core/metadata_integer.h branches/0.18/src/node/x3d-core/metadata_set.cpp branches/0.18/src/node/x3d-core/metadata_set.h branches/0.18/src/node/x3d-core/metadata_string.cpp branches/0.18/src/node/x3d-core/metadata_string.h branches/0.18/src/node/x3d-core/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/espdu_transform.cpp branches/0.18/src/node/x3d-dis/espdu_transform.h branches/0.18/src/node/x3d-dis/receiver_pdu.cpp branches/0.18/src/node/x3d-dis/receiver_pdu.h branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/signal_pdu.cpp branches/0.18/src/node/x3d-dis/signal_pdu.h branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp branches/0.18/src/node/x3d-dis/transmitter_pdu.h branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.h branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp branches/0.18/src/node/x3d-event-utilities/boolean_filter.h branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp branches/0.18/src/node/x3d-event-utilities/integer_trigger.h branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.h branches/0.18/src/node/x3d-geometry2d/arc2d.cpp branches/0.18/src/node/x3d-geometry2d/arc2d.h branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp branches/0.18/src/node/x3d-geometry2d/arc_close2d.h branches/0.18/src/node/x3d-geometry2d/circle2d.cpp branches/0.18/src/node/x3d-geometry2d/circle2d.h branches/0.18/src/node/x3d-geometry2d/disk2d.cpp branches/0.18/src/node/x3d-geometry2d/disk2d.h branches/0.18/src/node/x3d-geometry2d/polyline2d.cpp branches/0.18/src/node/x3d-geometry2d/polyline2d.h branches/0.18/src/node/x3d-geometry2d/polypoint2d.cpp branches/0.18/src/node/x3d-geometry2d/polypoint2d.h branches/0.18/src/node/x3d-geometry2d/rectangle2d.cpp branches/0.18/src/node/x3d-geometry2d/rectangle2d.h branches/0.18/src/node/x3d-geometry2d/register_node_metatypes.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.h branches/0.18/src/node/x3d-geospatial/geo_coordinate.cpp branches/0.18/src/node/x3d-geospatial/geo_coordinate.h branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.cpp branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.h branches/0.18/src/node/x3d-geospatial/geo_location.cpp branches/0.18/src/node/x3d-geospatial/geo_location.h branches/0.18/src/node/x3d-geospatial/geo_lod.cpp branches/0.18/src/node/x3d-geospatial/geo_lod.h branches/0.18/src/node/x3d-geospatial/geo_metadata.cpp branches/0.18/src/node/x3d-geospatial/geo_metadata.h branches/0.18/src/node/x3d-geospatial/geo_origin.cpp branches/0.18/src/node/x3d-geospatial/geo_origin.h branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.cpp branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.h branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.cpp branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.h branches/0.18/src/node/x3d-geospatial/geo_viewpoint.cpp branches/0.18/src/node/x3d-geospatial/geo_viewpoint.h branches/0.18/src/node/x3d-geospatial/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/static_group.cpp branches/0.18/src/node/x3d-grouping/static_group.h branches/0.18/src/node/x3d-h-anim/h_anim_displacer.cpp branches/0.18/src/node/x3d-h-anim/h_anim_displacer.h branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.cpp branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.h branches/0.18/src/node/x3d-h-anim/h_anim_joint.cpp branches/0.18/src/node/x3d-h-anim/h_anim_joint.h branches/0.18/src/node/x3d-h-anim/h_anim_segment.cpp branches/0.18/src/node/x3d-h-anim/h_anim_segment.h branches/0.18/src/node/x3d-h-anim/h_anim_site.cpp branches/0.18/src/node/x3d-h-anim/h_anim_site.h branches/0.18/src/node/x3d-h-anim/register_node_metatypes.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.h branches/0.18/src/node/x3d-interpolation/position_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/position_interpolator2d.h branches/0.18/src/node/x3d-interpolation/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.h branches/0.18/src/node/x3d-key-device-sensor/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.h branches/0.18/src/node/x3d-networking/load_sensor.cpp branches/0.18/src/node/x3d-networking/load_sensor.h branches/0.18/src/node/x3d-networking/register_node_metatypes.cpp branches/0.18/src/node/x3d-nurbs/contour2d.cpp branches/0.18/src/node/x3d-nurbs/contour2d.h branches/0.18/src/node/x3d-nurbs/contour_polyline2d.cpp branches/0.18/src/node/x3d-nurbs/contour_polyline2d.h branches/0.18/src/node/x3d-nurbs/coordinate_double.cpp branches/0.18/src/node/x3d-nurbs/coordinate_double.h branches/0.18/src/node/x3d-nurbs/nurbs_curve.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve.h branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.h branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_set.cpp branches/0.18/src/node/x3d-nurbs/nurbs_set.h branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.h branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.h branches/0.18/src/node/x3d-nurbs/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/color_rgba.cpp branches/0.18/src/node/x3d-rendering/color_rgba.h branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.h branches/0.18/src/node/x3d-rendering/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.h branches/0.18/src/node/x3d-rendering/triangle_set.cpp branches/0.18/src/node/x3d-rendering/triangle_set.h branches/0.18/src/node/x3d-rendering/triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/triangle_strip_set.h branches/0.18/src/node/x3d-shape/fill_properties.cpp branches/0.18/src/node/x3d-shape/fill_properties.h branches/0.18/src/node/x3d-shape/line_properties.cpp branches/0.18/src/node/x3d-shape/line_properties.h branches/0.18/src/node/x3d-shape/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/multi_texture.cpp branches/0.18/src/node/x3d-texturing/multi_texture.h branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.cpp branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.h branches/0.18/src/node/x3d-texturing/multi_texture_transform.cpp branches/0.18/src/node/x3d-texturing/multi_texture_transform.h branches/0.18/src/node/x3d-texturing/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.h Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2009-10-19 02:04:21 UTC (rev 3999) +++ branches/0.18/ChangeLog 2009-10-19 02:10:57 UTC (rev 4000) @@ -1,3 +1,13 @@ +2009-10-18 Braden McDaniel <br...@en...> + + Make throw_runtime_error_from_win32_system_error available to + other translation units. + + * src/Makefile.am + * src/libopenvrml/openvrml/local/conf.cpp + * src/libopenvrml/openvrml/local/error.cpp + * src/libopenvrml/openvrml/local/error.h + 2009-10-05 Braden McDaniel <br...@en...> * Makefile.am (VISUALC9_0_FILES): Added openvrml-dl.vcproj to the Modified: branches/0.18/src/Makefile.am =================================================================== --- branches/0.18/src/Makefile.am 2009-10-19 02:04:21 UTC (rev 3999) +++ branches/0.18/src/Makefile.am 2009-10-19 02:10:57 UTC (rev 4000) @@ -96,6 +96,8 @@ libopenvrml/openvrml/node_impl_util.cpp \ libopenvrml/openvrml/local/conf.cpp \ libopenvrml/openvrml/local/conf.h \ + libopenvrml/openvrml/local/error.cpp \ + libopenvrml/openvrml/local/error.h \ libopenvrml/openvrml/local/uri.cpp \ libopenvrml/openvrml/local/uri.h \ libopenvrml/openvrml/local/xml_reader.cpp \ Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Modified: branches/0.18/src/libopenvrml/openvrml/local/conf.cpp =================================================================== --- branches/0.18/src/libopenvrml/openvrml/local/conf.cpp 2009-10-19 02:04:21 UTC (rev 3999) +++ branches/0.18/src/libopenvrml/openvrml/local/conf.cpp 2009-10-19 02:10:57 UTC (rev 4000) @@ -19,6 +19,7 @@ // # include "conf.h" +# include "error.h" # include <boost/multi_index/detail/scope_guard.hpp> # include <boost/ref.hpp> # include <boost/tokenizer.hpp> @@ -64,25 +65,6 @@ } # ifdef _WIN32 - void throw_runtime_error(LONG result) OPENVRML_THROW1(std::runtime_error) - { - using boost::ref; - - static const LPCVOID source; - LPTSTR buf = 0; - scope_guard buf_guard = make_guard(LocalFree, ref(buf)); - FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM - | FORMAT_MESSAGE_ALLOCATE_BUFFER, - source, - result, - LANG_USER_DEFAULT, - reinterpret_cast< LPTSTR >(&buf), - 0, - 0); - - throw std::runtime_error(buf); - } - const std::string query_registry_value(HKEY key, const std::string & name) OPENVRML_THROW2(std::runtime_error, std::bad_alloc) { @@ -101,7 +83,9 @@ data.resize(data.size() * 2); } - if (result != 0) { throw_runtime_error(result); } + if (result != 0) { + throw_runtime_error_from_win32_system_error(result); + } _ASSERTE(type == REG_SZ); @@ -125,7 +109,7 @@ &key); if (result != ERROR_SUCCESS) { if (result == ERROR_FILE_NOT_FOUND) { throw no_registry_key(); } - throw_runtime_error(result); + throw_runtime_error_from_win32_system_error(result); } return query_registry_value(key, name); Copied: branches/0.18/src/libopenvrml/openvrml/local/error.cpp (from rev 3999, trunk/src/libopenvrml/openvrml/local/error.cpp) =================================================================== --- branches/0.18/src/libopenvrml/openvrml/local/error.cpp (rev 0) +++ branches/0.18/src/libopenvrml/openvrml/local/error.cpp 2009-10-19 02:10:57 UTC (rev 4000) @@ -0,0 +1,43 @@ +// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*- +// +// OpenVRML +// +// Copyright 2009 Braden McDaniel +// +// This library is free software; you can redistribute it and/or modify it +// under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 3 of the License, or (at +// your option) any later version. +// +// This library 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 Lesser General Public +// License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this library; if not, see <http://www.gnu.org/licenses/>. +// + +# include "error.h" + +# ifdef _WIN32 +void openvrml::local::throw_runtime_error_from_win32_system_error(LONG result) + OPENVRML_THROW1(std::runtime_error) +{ + using boost::ref; + + static const LPCVOID source; + LPTSTR buf = 0; + scope_guard buf_guard = make_guard(LocalFree, ref(buf)); + FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM + | FORMAT_MESSAGE_ALLOCATE_BUFFER, + source, + result, + LANG_USER_DEFAULT, + reinterpret_cast< LPTSTR >(&buf), + 0, + 0); + + throw std::runtime_error(buf); +} +# endif Copied: branches/0.18/src/libopenvrml/openvrml/local/error.h (from rev 3999, trunk/src/libopenvrml/openvrml/local/error.h) =================================================================== --- branches/0.18/src/libopenvrml/openvrml/local/error.h (rev 0) +++ branches/0.18/src/libopenvrml/openvrml/local/error.h 2009-10-19 02:10:57 UTC (rev 4000) @@ -0,0 +1,42 @@ +// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*- +// +// OpenVRML +// +// Copyright 2009 Braden McDaniel +// +// This library is free software; you can redistribute it and/or modify it +// under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 3 of the License, or (at +// your option) any later version. +// +// This library 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 Lesser General Public +// License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this library; if not, see <http://www.gnu.org/licenses/>. +// + +# ifndef OPENVRML_LOCAL_ERROR_H +# define OPENVRML_LOCAL_ERROR_H + +# include <openvrml-common.h> +# include <stdexcept> +# ifdef _WIN32 +# include <windows.h> +# endif + +namespace openvrml { + + namespace local { + +# ifdef _WIN32 + OPENVRML_LOCAL + void throw_runtime_error_from_win32_system_error(LONG error) + OPENVRML_THROW1(std::runtime_error); +# endif + } +} + +# endif // ifndef OPENVRML_LOCAL_ERROR_H Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/libopenvrml/openvrml/script.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/mozilla-plugin ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/node/vrml97/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/node/x3d-core/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/node/x3d-dis/transmitter_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 /trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 /trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/node/x3d-environmental-effects/texture_background.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_filter.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997 + /branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,... [truncated message content] |
From: <br...@us...> - 2009-10-19 04:17:02
|
Revision: 4002 http://openvrml.svn.sourceforge.net/openvrml/?rev=4002&view=rev Author: braden Date: 2009-10-19 04:16:53 +0000 (Mon, 19 Oct 2009) Log Message: ----------- Only print out debugging message if we actually erased any references. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/src/openvrml-xembed/main.cpp Property Changed: ---------------- branches/0.18/ branches/0.18/src/libopenvrml/openvrml/bad_url.cpp branches/0.18/src/libopenvrml/openvrml/bad_url.h branches/0.18/src/libopenvrml/openvrml/local/proto.cpp branches/0.18/src/libopenvrml/openvrml/local/proto.h branches/0.18/src/libopenvrml/openvrml/scene.cpp branches/0.18/src/libopenvrml/openvrml/scene.h branches/0.18/src/libopenvrml/openvrml/script.cpp branches/0.18/src/mozilla-plugin/ branches/0.18/src/node/vrml97/register_node_metatypes.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.h branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp branches/0.18/src/node/x3d-core/metadata_double.cpp branches/0.18/src/node/x3d-core/metadata_double.h branches/0.18/src/node/x3d-core/metadata_float.cpp branches/0.18/src/node/x3d-core/metadata_float.h branches/0.18/src/node/x3d-core/metadata_integer.cpp branches/0.18/src/node/x3d-core/metadata_integer.h branches/0.18/src/node/x3d-core/metadata_set.cpp branches/0.18/src/node/x3d-core/metadata_set.h branches/0.18/src/node/x3d-core/metadata_string.cpp branches/0.18/src/node/x3d-core/metadata_string.h branches/0.18/src/node/x3d-core/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/espdu_transform.cpp branches/0.18/src/node/x3d-dis/espdu_transform.h branches/0.18/src/node/x3d-dis/receiver_pdu.cpp branches/0.18/src/node/x3d-dis/receiver_pdu.h branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/signal_pdu.cpp branches/0.18/src/node/x3d-dis/signal_pdu.h branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp branches/0.18/src/node/x3d-dis/transmitter_pdu.h branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.h branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp branches/0.18/src/node/x3d-event-utilities/boolean_filter.h branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp branches/0.18/src/node/x3d-event-utilities/integer_trigger.h branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.h branches/0.18/src/node/x3d-geometry2d/arc2d.cpp branches/0.18/src/node/x3d-geometry2d/arc2d.h branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp branches/0.18/src/node/x3d-geometry2d/arc_close2d.h branches/0.18/src/node/x3d-geometry2d/circle2d.cpp branches/0.18/src/node/x3d-geometry2d/circle2d.h branches/0.18/src/node/x3d-geometry2d/disk2d.cpp branches/0.18/src/node/x3d-geometry2d/disk2d.h branches/0.18/src/node/x3d-geometry2d/polyline2d.cpp branches/0.18/src/node/x3d-geometry2d/polyline2d.h branches/0.18/src/node/x3d-geometry2d/polypoint2d.cpp branches/0.18/src/node/x3d-geometry2d/polypoint2d.h branches/0.18/src/node/x3d-geometry2d/rectangle2d.cpp branches/0.18/src/node/x3d-geometry2d/rectangle2d.h branches/0.18/src/node/x3d-geometry2d/register_node_metatypes.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.h branches/0.18/src/node/x3d-geospatial/geo_coordinate.cpp branches/0.18/src/node/x3d-geospatial/geo_coordinate.h branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.cpp branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.h branches/0.18/src/node/x3d-geospatial/geo_location.cpp branches/0.18/src/node/x3d-geospatial/geo_location.h branches/0.18/src/node/x3d-geospatial/geo_lod.cpp branches/0.18/src/node/x3d-geospatial/geo_lod.h branches/0.18/src/node/x3d-geospatial/geo_metadata.cpp branches/0.18/src/node/x3d-geospatial/geo_metadata.h branches/0.18/src/node/x3d-geospatial/geo_origin.cpp branches/0.18/src/node/x3d-geospatial/geo_origin.h branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.cpp branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.h branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.cpp branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.h branches/0.18/src/node/x3d-geospatial/geo_viewpoint.cpp branches/0.18/src/node/x3d-geospatial/geo_viewpoint.h branches/0.18/src/node/x3d-geospatial/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/static_group.cpp branches/0.18/src/node/x3d-grouping/static_group.h branches/0.18/src/node/x3d-h-anim/h_anim_displacer.cpp branches/0.18/src/node/x3d-h-anim/h_anim_displacer.h branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.cpp branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.h branches/0.18/src/node/x3d-h-anim/h_anim_joint.cpp branches/0.18/src/node/x3d-h-anim/h_anim_joint.h branches/0.18/src/node/x3d-h-anim/h_anim_segment.cpp branches/0.18/src/node/x3d-h-anim/h_anim_segment.h branches/0.18/src/node/x3d-h-anim/h_anim_site.cpp branches/0.18/src/node/x3d-h-anim/h_anim_site.h branches/0.18/src/node/x3d-h-anim/register_node_metatypes.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.h branches/0.18/src/node/x3d-interpolation/position_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/position_interpolator2d.h branches/0.18/src/node/x3d-interpolation/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.h branches/0.18/src/node/x3d-key-device-sensor/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.h branches/0.18/src/node/x3d-networking/load_sensor.cpp branches/0.18/src/node/x3d-networking/load_sensor.h branches/0.18/src/node/x3d-networking/register_node_metatypes.cpp branches/0.18/src/node/x3d-nurbs/contour2d.cpp branches/0.18/src/node/x3d-nurbs/contour2d.h branches/0.18/src/node/x3d-nurbs/contour_polyline2d.cpp branches/0.18/src/node/x3d-nurbs/contour_polyline2d.h branches/0.18/src/node/x3d-nurbs/coordinate_double.cpp branches/0.18/src/node/x3d-nurbs/coordinate_double.h branches/0.18/src/node/x3d-nurbs/nurbs_curve.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve.h branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.h branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_set.cpp branches/0.18/src/node/x3d-nurbs/nurbs_set.h branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.h branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.h branches/0.18/src/node/x3d-nurbs/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/color_rgba.cpp branches/0.18/src/node/x3d-rendering/color_rgba.h branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.h branches/0.18/src/node/x3d-rendering/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.h branches/0.18/src/node/x3d-rendering/triangle_set.cpp branches/0.18/src/node/x3d-rendering/triangle_set.h branches/0.18/src/node/x3d-rendering/triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/triangle_strip_set.h branches/0.18/src/node/x3d-shape/fill_properties.cpp branches/0.18/src/node/x3d-shape/fill_properties.h branches/0.18/src/node/x3d-shape/line_properties.cpp branches/0.18/src/node/x3d-shape/line_properties.h branches/0.18/src/node/x3d-shape/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/multi_texture.cpp branches/0.18/src/node/x3d-texturing/multi_texture.h branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.cpp branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.h branches/0.18/src/node/x3d-texturing/multi_texture_transform.cpp branches/0.18/src/node/x3d-texturing/multi_texture_transform.h branches/0.18/src/node/x3d-texturing/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.h Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2009-10-19 02:21:05 UTC (rev 4001) +++ branches/0.18/ChangeLog 2009-10-19 04:16:53 UTC (rev 4002) @@ -3,7 +3,8 @@ Make throw_runtime_error_from_win32_system_error available to other translation units. - * src/Makefile.am + * src/Makefile.am (libopenvrml_libopenvrml_la_SOURCES): Added + libopenvrml/openvrml/local/error.{cpp,h}. * src/libopenvrml/openvrml/local/conf.cpp * src/libopenvrml/openvrml/local/error.cpp * src/libopenvrml/openvrml/local/error.h Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/libopenvrml/openvrml/script.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/mozilla-plugin ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/vrml97/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-core/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-dis/transmitter_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 /trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 /trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-environmental-effects/texture_background.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_filter.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/local/src/node/x3d-event-utilities/integer_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3734 /trunk/src/node/x3d-event-utilities/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/0.17/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3734 /trunk/src/node/x3d-event-utilities/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 Property changes on: branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/time_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/time_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999 + /branches/local/src/node/x3d-event-utilities/time_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3... [truncated message content] |
From: <br...@us...> - 2009-10-19 07:20:07
|
Revision: 4004 http://openvrml.svn.sourceforge.net/openvrml/?rev=4004&view=rev Author: braden Date: 2009-10-19 07:19:59 +0000 (Mon, 19 Oct 2009) Log Message: ----------- Fixes for building against Boost 1.40.0. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/src/libopenvrml/openvrml/browser.cpp branches/0.18/src/libopenvrml/openvrml/local/externproto.cpp branches/0.18/src/libopenvrml/openvrml/local/uri.cpp branches/0.18/src/libopenvrml/openvrml/scene.cpp branches/0.18/src/local/libopenvrml-control/openvrml_control/browser.h branches/0.18/src/node/vrml97/inline.cpp branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp branches/0.18/src/openvrml-xembed/main.cpp Property Changed: ---------------- branches/0.18/ branches/0.18/src/libopenvrml/openvrml/bad_url.cpp branches/0.18/src/libopenvrml/openvrml/bad_url.h branches/0.18/src/libopenvrml/openvrml/local/proto.cpp branches/0.18/src/libopenvrml/openvrml/local/proto.h branches/0.18/src/libopenvrml/openvrml/scene.cpp branches/0.18/src/libopenvrml/openvrml/scene.h branches/0.18/src/libopenvrml/openvrml/script.cpp branches/0.18/src/mozilla-plugin/ branches/0.18/src/node/vrml97/register_node_metatypes.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.h branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp branches/0.18/src/node/x3d-core/metadata_double.cpp branches/0.18/src/node/x3d-core/metadata_double.h branches/0.18/src/node/x3d-core/metadata_float.cpp branches/0.18/src/node/x3d-core/metadata_float.h branches/0.18/src/node/x3d-core/metadata_integer.cpp branches/0.18/src/node/x3d-core/metadata_integer.h branches/0.18/src/node/x3d-core/metadata_set.cpp branches/0.18/src/node/x3d-core/metadata_set.h branches/0.18/src/node/x3d-core/metadata_string.cpp branches/0.18/src/node/x3d-core/metadata_string.h branches/0.18/src/node/x3d-core/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/espdu_transform.cpp branches/0.18/src/node/x3d-dis/espdu_transform.h branches/0.18/src/node/x3d-dis/receiver_pdu.cpp branches/0.18/src/node/x3d-dis/receiver_pdu.h branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/signal_pdu.cpp branches/0.18/src/node/x3d-dis/signal_pdu.h branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp branches/0.18/src/node/x3d-dis/transmitter_pdu.h branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.h branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp branches/0.18/src/node/x3d-event-utilities/boolean_filter.h branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp branches/0.18/src/node/x3d-event-utilities/integer_trigger.h branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.h branches/0.18/src/node/x3d-geometry2d/arc2d.cpp branches/0.18/src/node/x3d-geometry2d/arc2d.h branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp branches/0.18/src/node/x3d-geometry2d/arc_close2d.h branches/0.18/src/node/x3d-geometry2d/circle2d.cpp branches/0.18/src/node/x3d-geometry2d/circle2d.h branches/0.18/src/node/x3d-geometry2d/disk2d.cpp branches/0.18/src/node/x3d-geometry2d/disk2d.h branches/0.18/src/node/x3d-geometry2d/polyline2d.cpp branches/0.18/src/node/x3d-geometry2d/polyline2d.h branches/0.18/src/node/x3d-geometry2d/polypoint2d.cpp branches/0.18/src/node/x3d-geometry2d/polypoint2d.h branches/0.18/src/node/x3d-geometry2d/rectangle2d.cpp branches/0.18/src/node/x3d-geometry2d/rectangle2d.h branches/0.18/src/node/x3d-geometry2d/register_node_metatypes.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.h branches/0.18/src/node/x3d-geospatial/geo_coordinate.cpp branches/0.18/src/node/x3d-geospatial/geo_coordinate.h branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.cpp branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.h branches/0.18/src/node/x3d-geospatial/geo_location.cpp branches/0.18/src/node/x3d-geospatial/geo_location.h branches/0.18/src/node/x3d-geospatial/geo_lod.cpp branches/0.18/src/node/x3d-geospatial/geo_lod.h branches/0.18/src/node/x3d-geospatial/geo_metadata.cpp branches/0.18/src/node/x3d-geospatial/geo_metadata.h branches/0.18/src/node/x3d-geospatial/geo_origin.cpp branches/0.18/src/node/x3d-geospatial/geo_origin.h branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.cpp branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.h branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.cpp branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.h branches/0.18/src/node/x3d-geospatial/geo_viewpoint.cpp branches/0.18/src/node/x3d-geospatial/geo_viewpoint.h branches/0.18/src/node/x3d-geospatial/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/static_group.cpp branches/0.18/src/node/x3d-grouping/static_group.h branches/0.18/src/node/x3d-h-anim/h_anim_displacer.cpp branches/0.18/src/node/x3d-h-anim/h_anim_displacer.h branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.cpp branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.h branches/0.18/src/node/x3d-h-anim/h_anim_joint.cpp branches/0.18/src/node/x3d-h-anim/h_anim_joint.h branches/0.18/src/node/x3d-h-anim/h_anim_segment.cpp branches/0.18/src/node/x3d-h-anim/h_anim_segment.h branches/0.18/src/node/x3d-h-anim/h_anim_site.cpp branches/0.18/src/node/x3d-h-anim/h_anim_site.h branches/0.18/src/node/x3d-h-anim/register_node_metatypes.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.h branches/0.18/src/node/x3d-interpolation/position_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/position_interpolator2d.h branches/0.18/src/node/x3d-interpolation/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.h branches/0.18/src/node/x3d-key-device-sensor/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.h branches/0.18/src/node/x3d-networking/load_sensor.cpp branches/0.18/src/node/x3d-networking/load_sensor.h branches/0.18/src/node/x3d-networking/register_node_metatypes.cpp branches/0.18/src/node/x3d-nurbs/contour2d.cpp branches/0.18/src/node/x3d-nurbs/contour2d.h branches/0.18/src/node/x3d-nurbs/contour_polyline2d.cpp branches/0.18/src/node/x3d-nurbs/contour_polyline2d.h branches/0.18/src/node/x3d-nurbs/coordinate_double.cpp branches/0.18/src/node/x3d-nurbs/coordinate_double.h branches/0.18/src/node/x3d-nurbs/nurbs_curve.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve.h branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.h branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_set.cpp branches/0.18/src/node/x3d-nurbs/nurbs_set.h branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.h branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.h branches/0.18/src/node/x3d-nurbs/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/color_rgba.cpp branches/0.18/src/node/x3d-rendering/color_rgba.h branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.h branches/0.18/src/node/x3d-rendering/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.h branches/0.18/src/node/x3d-rendering/triangle_set.cpp branches/0.18/src/node/x3d-rendering/triangle_set.h branches/0.18/src/node/x3d-rendering/triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/triangle_strip_set.h branches/0.18/src/node/x3d-shape/fill_properties.cpp branches/0.18/src/node/x3d-shape/fill_properties.h branches/0.18/src/node/x3d-shape/line_properties.cpp branches/0.18/src/node/x3d-shape/line_properties.h branches/0.18/src/node/x3d-shape/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/multi_texture.cpp branches/0.18/src/node/x3d-texturing/multi_texture.h branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.cpp branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.h branches/0.18/src/node/x3d-texturing/multi_texture_transform.cpp branches/0.18/src/node/x3d-texturing/multi_texture_transform.h branches/0.18/src/node/x3d-texturing/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.h Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2009-10-19 07:07:50 UTC (rev 4003) +++ branches/0.18/ChangeLog 2009-10-19 07:19:59 UTC (rev 4004) @@ -1,5 +1,25 @@ +2009-10-19 Braden McDaniel <br...@en...> + + Fixes for building against Boost 1.40.0. + + * src/libopenvrml/openvrml/browser.cpp + * src/libopenvrml/openvrml/local/uri.cpp + * src/libopenvrml/openvrml/local/externproto.cpp + * src/libopenvrml/openvrml/scene.cpp + * src/local/libopenvrml-control/openvrml_control/browser.h + * src/node/vrml97/inline.cpp + * src/node/x3d-nurbs/nurbs_trimmed_surface.cpp + * src/openvrml-xembed/main.cpp + 2009-10-18 Braden McDaniel <br...@en...> + * src/openvrml-xembed/main.cpp + (openvrml_xembed_name_owner_changed(DBusGProxy *, const gchar *, + const gchar *, const gchar *, gpointer)): Only print out debugging + message if we actually erased any references. + +2009-10-18 Braden McDaniel <br...@en...> + Make throw_runtime_error_from_win32_system_error available to other translation units. Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Modified: branches/0.18/src/libopenvrml/openvrml/browser.cpp =================================================================== --- branches/0.18/src/libopenvrml/openvrml/browser.cpp 2009-10-19 07:07:50 UTC (rev 4003) +++ branches/0.18/src/libopenvrml/openvrml/browser.cpp 2009-10-19 07:19:59 UTC (rev 4004) @@ -29,6 +29,7 @@ # include <openvrml/local/parse_vrml.h> # include <private.h> # include <boost/bind.hpp> +# include <boost/function.hpp> # include <boost/functional.hpp> # include <boost/lexical_cast.hpp> # include <boost/multi_index/detail/scope_guard.hpp> Modified: branches/0.18/src/libopenvrml/openvrml/local/externproto.cpp =================================================================== --- branches/0.18/src/libopenvrml/openvrml/local/externproto.cpp 2009-10-19 07:07:50 UTC (rev 4003) +++ branches/0.18/src/libopenvrml/openvrml/local/externproto.cpp 2009-10-19 07:19:59 UTC (rev 4004) @@ -23,6 +23,7 @@ # include "uri.h" # include <openvrml/browser.h> # include <openvrml/scene.h> +# include <boost/function.hpp> # include <boost/mpl/for_each.hpp> # include <boost/multi_index/detail/scope_guard.hpp> Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Modified: branches/0.18/src/libopenvrml/openvrml/local/uri.cpp =================================================================== --- branches/0.18/src/libopenvrml/openvrml/local/uri.cpp 2009-10-19 07:07:50 UTC (rev 4003) +++ branches/0.18/src/libopenvrml/openvrml/local/uri.cpp 2009-10-19 07:19:59 UTC (rev 4004) @@ -21,6 +21,7 @@ # include "uri.h" # include <list> # include <cerrno> +# include <cstring> # ifdef _WIN32 # include <boost/multi_index/detail/scope_guard.hpp> using namespace boost::multi_index::detail; // for scope_guard @@ -596,7 +597,7 @@ assert(errno != 0); assert(errno != EFAULT); assert(errno != EINVAL); - throw std::runtime_error(strerror(errno)); + throw std::runtime_error(std::strerror(errno)); } # endif return std::string(&buf.front()); Modified: branches/0.18/src/libopenvrml/openvrml/scene.cpp =================================================================== --- branches/0.18/src/libopenvrml/openvrml/scene.cpp 2009-10-19 07:07:50 UTC (rev 4003) +++ branches/0.18/src/libopenvrml/openvrml/scene.cpp 2009-10-19 07:19:59 UTC (rev 4004) @@ -24,6 +24,7 @@ # include <openvrml/local/uri.h> # include <openvrml/local/parse_vrml.h> # include <private.h> +# include <boost/function.hpp> # ifdef HAVE_CONFIG_H # include <config.h> Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/libopenvrml/openvrml/script.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Modified: branches/0.18/src/local/libopenvrml-control/openvrml_control/browser.h =================================================================== --- branches/0.18/src/local/libopenvrml-control/openvrml_control/browser.h 2009-10-19 07:07:50 UTC (rev 4003) +++ branches/0.18/src/local/libopenvrml-control/openvrml_control/browser.h 2009-10-19 07:19:59 UTC (rev 4004) @@ -22,6 +22,7 @@ # define OPENVRML_CONTROL_BROWSER_H # include <openvrml/browser.h> +# include <boost/function.hpp> namespace openvrml_control { Property changes on: branches/0.18/src/mozilla-plugin ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Modified: branches/0.18/src/node/vrml97/inline.cpp =================================================================== --- branches/0.18/src/node/vrml97/inline.cpp 2009-10-19 07:07:50 UTC (rev 4003) +++ branches/0.18/src/node/vrml97/inline.cpp 2009-10-19 07:19:59 UTC (rev 4004) @@ -29,6 +29,7 @@ # include <openvrml/scene.h> # include <private.h> # include <boost/array.hpp> +# include <boost/function.hpp> namespace { Property changes on: branches/0.18/src/node/vrml97/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-core/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-dis/transmitter_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 /trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 /trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-environmental-effects/texture_background.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_filter.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001 + /branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 Property changes on: branches/0.18/src/node/x3d-event-utilities... [truncated message content] |
From: <br...@us...> - 2009-10-19 16:22:27
|
Revision: 4006 http://openvrml.svn.sourceforge.net/openvrml/?rev=4006&view=rev Author: braden Date: 2009-10-19 16:22:19 +0000 (Mon, 19 Oct 2009) Log Message: ----------- Call do_modified to avoid recursion. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/src/node/vrml97/collision.cpp Property Changed: ---------------- branches/0.18/ branches/0.18/src/libopenvrml/openvrml/bad_url.cpp branches/0.18/src/libopenvrml/openvrml/bad_url.h branches/0.18/src/libopenvrml/openvrml/local/proto.cpp branches/0.18/src/libopenvrml/openvrml/local/proto.h branches/0.18/src/libopenvrml/openvrml/scene.cpp branches/0.18/src/libopenvrml/openvrml/scene.h branches/0.18/src/libopenvrml/openvrml/script.cpp branches/0.18/src/mozilla-plugin/ branches/0.18/src/node/vrml97/register_node_metatypes.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.h branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp branches/0.18/src/node/x3d-core/metadata_double.cpp branches/0.18/src/node/x3d-core/metadata_double.h branches/0.18/src/node/x3d-core/metadata_float.cpp branches/0.18/src/node/x3d-core/metadata_float.h branches/0.18/src/node/x3d-core/metadata_integer.cpp branches/0.18/src/node/x3d-core/metadata_integer.h branches/0.18/src/node/x3d-core/metadata_set.cpp branches/0.18/src/node/x3d-core/metadata_set.h branches/0.18/src/node/x3d-core/metadata_string.cpp branches/0.18/src/node/x3d-core/metadata_string.h branches/0.18/src/node/x3d-core/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/espdu_transform.cpp branches/0.18/src/node/x3d-dis/espdu_transform.h branches/0.18/src/node/x3d-dis/receiver_pdu.cpp branches/0.18/src/node/x3d-dis/receiver_pdu.h branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/signal_pdu.cpp branches/0.18/src/node/x3d-dis/signal_pdu.h branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp branches/0.18/src/node/x3d-dis/transmitter_pdu.h branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.h branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp branches/0.18/src/node/x3d-event-utilities/boolean_filter.h branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp branches/0.18/src/node/x3d-event-utilities/integer_trigger.h branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.h branches/0.18/src/node/x3d-geometry2d/arc2d.cpp branches/0.18/src/node/x3d-geometry2d/arc2d.h branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp branches/0.18/src/node/x3d-geometry2d/arc_close2d.h branches/0.18/src/node/x3d-geometry2d/circle2d.cpp branches/0.18/src/node/x3d-geometry2d/circle2d.h branches/0.18/src/node/x3d-geometry2d/disk2d.cpp branches/0.18/src/node/x3d-geometry2d/disk2d.h branches/0.18/src/node/x3d-geometry2d/polyline2d.cpp branches/0.18/src/node/x3d-geometry2d/polyline2d.h branches/0.18/src/node/x3d-geometry2d/polypoint2d.cpp branches/0.18/src/node/x3d-geometry2d/polypoint2d.h branches/0.18/src/node/x3d-geometry2d/rectangle2d.cpp branches/0.18/src/node/x3d-geometry2d/rectangle2d.h branches/0.18/src/node/x3d-geometry2d/register_node_metatypes.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.h branches/0.18/src/node/x3d-geospatial/geo_coordinate.cpp branches/0.18/src/node/x3d-geospatial/geo_coordinate.h branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.cpp branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.h branches/0.18/src/node/x3d-geospatial/geo_location.cpp branches/0.18/src/node/x3d-geospatial/geo_location.h branches/0.18/src/node/x3d-geospatial/geo_lod.cpp branches/0.18/src/node/x3d-geospatial/geo_lod.h branches/0.18/src/node/x3d-geospatial/geo_metadata.cpp branches/0.18/src/node/x3d-geospatial/geo_metadata.h branches/0.18/src/node/x3d-geospatial/geo_origin.cpp branches/0.18/src/node/x3d-geospatial/geo_origin.h branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.cpp branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.h branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.cpp branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.h branches/0.18/src/node/x3d-geospatial/geo_viewpoint.cpp branches/0.18/src/node/x3d-geospatial/geo_viewpoint.h branches/0.18/src/node/x3d-geospatial/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/static_group.cpp branches/0.18/src/node/x3d-grouping/static_group.h branches/0.18/src/node/x3d-h-anim/h_anim_displacer.cpp branches/0.18/src/node/x3d-h-anim/h_anim_displacer.h branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.cpp branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.h branches/0.18/src/node/x3d-h-anim/h_anim_joint.cpp branches/0.18/src/node/x3d-h-anim/h_anim_joint.h branches/0.18/src/node/x3d-h-anim/h_anim_segment.cpp branches/0.18/src/node/x3d-h-anim/h_anim_segment.h branches/0.18/src/node/x3d-h-anim/h_anim_site.cpp branches/0.18/src/node/x3d-h-anim/h_anim_site.h branches/0.18/src/node/x3d-h-anim/register_node_metatypes.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.h branches/0.18/src/node/x3d-interpolation/position_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/position_interpolator2d.h branches/0.18/src/node/x3d-interpolation/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.h branches/0.18/src/node/x3d-key-device-sensor/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.h branches/0.18/src/node/x3d-networking/load_sensor.cpp branches/0.18/src/node/x3d-networking/load_sensor.h branches/0.18/src/node/x3d-networking/register_node_metatypes.cpp branches/0.18/src/node/x3d-nurbs/contour2d.cpp branches/0.18/src/node/x3d-nurbs/contour2d.h branches/0.18/src/node/x3d-nurbs/contour_polyline2d.cpp branches/0.18/src/node/x3d-nurbs/contour_polyline2d.h branches/0.18/src/node/x3d-nurbs/coordinate_double.cpp branches/0.18/src/node/x3d-nurbs/coordinate_double.h branches/0.18/src/node/x3d-nurbs/nurbs_curve.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve.h branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.h branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_set.cpp branches/0.18/src/node/x3d-nurbs/nurbs_set.h branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.h branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.h branches/0.18/src/node/x3d-nurbs/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/color_rgba.cpp branches/0.18/src/node/x3d-rendering/color_rgba.h branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.h branches/0.18/src/node/x3d-rendering/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.h branches/0.18/src/node/x3d-rendering/triangle_set.cpp branches/0.18/src/node/x3d-rendering/triangle_set.h branches/0.18/src/node/x3d-rendering/triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/triangle_strip_set.h branches/0.18/src/node/x3d-shape/fill_properties.cpp branches/0.18/src/node/x3d-shape/fill_properties.h branches/0.18/src/node/x3d-shape/line_properties.cpp branches/0.18/src/node/x3d-shape/line_properties.h branches/0.18/src/node/x3d-shape/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/multi_texture.cpp branches/0.18/src/node/x3d-texturing/multi_texture.h branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.cpp branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.h branches/0.18/src/node/x3d-texturing/multi_texture_transform.cpp branches/0.18/src/node/x3d-texturing/multi_texture_transform.h branches/0.18/src/node/x3d-texturing/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.h Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2009-10-19 16:17:53 UTC (rev 4005) +++ branches/0.18/ChangeLog 2009-10-19 16:22:19 UTC (rev 4006) @@ -1,5 +1,11 @@ 2009-10-19 Braden McDaniel <br...@en...> + * src/node/vrml97/collision.cpp + (collision_node::do_modified() const): Call do_modified to avoid + recursion. + +2009-10-19 Braden McDaniel <br...@en...> + Fixes for building against Boost 1.40.0. * src/libopenvrml/openvrml/browser.cpp Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/libopenvrml/openvrml/script.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/mozilla-plugin ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Modified: branches/0.18/src/node/vrml97/collision.cpp =================================================================== --- branches/0.18/src/node/vrml97/collision.cpp 2009-10-19 16:17:53 UTC (rev 4005) +++ branches/0.18/src/node/vrml97/collision.cpp 2009-10-19 16:22:19 UTC (rev 4006) @@ -126,7 +126,7 @@ { return (this->proxy_.value() && this->proxy_.value()->modified()) || (this->openvrml_node_vrml97::grouping_node_base<collision_node>:: - modified()); + do_modified()); } } Property changes on: branches/0.18/src/node/vrml97/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-core/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-dis/transmitter_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 /trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 /trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-environmental-effects/texture_background.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_filter.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003 + /branches/local/src/node/x3d-event-utilities/integer_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 Property changes on: branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3713,3717,3719,3721,3725,373... [truncated message content] |
From: <br...@us...> - 2009-10-24 06:57:20
|
Revision: 4012 http://openvrml.svn.sourceforge.net/openvrml/?rev=4012&view=rev Author: braden Date: 2009-10-24 06:57:11 +0000 (Sat, 24 Oct 2009) Log Message: ----------- Clean up legacy cruft in handling of GRE_PATH. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/configure.ac Property Changed: ---------------- branches/0.18/ branches/0.18/src/libopenvrml/openvrml/bad_url.cpp branches/0.18/src/libopenvrml/openvrml/bad_url.h branches/0.18/src/libopenvrml/openvrml/local/proto.cpp branches/0.18/src/libopenvrml/openvrml/local/proto.h branches/0.18/src/libopenvrml/openvrml/scene.cpp branches/0.18/src/libopenvrml/openvrml/scene.h branches/0.18/src/libopenvrml/openvrml/script.cpp branches/0.18/src/mozilla-plugin/ branches/0.18/src/node/vrml97/register_node_metatypes.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.h branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp branches/0.18/src/node/x3d-core/metadata_double.cpp branches/0.18/src/node/x3d-core/metadata_double.h branches/0.18/src/node/x3d-core/metadata_float.cpp branches/0.18/src/node/x3d-core/metadata_float.h branches/0.18/src/node/x3d-core/metadata_integer.cpp branches/0.18/src/node/x3d-core/metadata_integer.h branches/0.18/src/node/x3d-core/metadata_set.cpp branches/0.18/src/node/x3d-core/metadata_set.h branches/0.18/src/node/x3d-core/metadata_string.cpp branches/0.18/src/node/x3d-core/metadata_string.h branches/0.18/src/node/x3d-core/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/espdu_transform.cpp branches/0.18/src/node/x3d-dis/espdu_transform.h branches/0.18/src/node/x3d-dis/receiver_pdu.cpp branches/0.18/src/node/x3d-dis/receiver_pdu.h branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/signal_pdu.cpp branches/0.18/src/node/x3d-dis/signal_pdu.h branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp branches/0.18/src/node/x3d-dis/transmitter_pdu.h branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.h branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp branches/0.18/src/node/x3d-event-utilities/boolean_filter.h branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp branches/0.18/src/node/x3d-event-utilities/integer_trigger.h branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.h branches/0.18/src/node/x3d-geometry2d/arc2d.cpp branches/0.18/src/node/x3d-geometry2d/arc2d.h branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp branches/0.18/src/node/x3d-geometry2d/arc_close2d.h branches/0.18/src/node/x3d-geometry2d/circle2d.cpp branches/0.18/src/node/x3d-geometry2d/circle2d.h branches/0.18/src/node/x3d-geometry2d/disk2d.cpp branches/0.18/src/node/x3d-geometry2d/disk2d.h branches/0.18/src/node/x3d-geometry2d/polyline2d.cpp branches/0.18/src/node/x3d-geometry2d/polyline2d.h branches/0.18/src/node/x3d-geometry2d/polypoint2d.cpp branches/0.18/src/node/x3d-geometry2d/polypoint2d.h branches/0.18/src/node/x3d-geometry2d/rectangle2d.cpp branches/0.18/src/node/x3d-geometry2d/rectangle2d.h branches/0.18/src/node/x3d-geometry2d/register_node_metatypes.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.h branches/0.18/src/node/x3d-geospatial/geo_coordinate.cpp branches/0.18/src/node/x3d-geospatial/geo_coordinate.h branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.cpp branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.h branches/0.18/src/node/x3d-geospatial/geo_location.cpp branches/0.18/src/node/x3d-geospatial/geo_location.h branches/0.18/src/node/x3d-geospatial/geo_lod.cpp branches/0.18/src/node/x3d-geospatial/geo_lod.h branches/0.18/src/node/x3d-geospatial/geo_metadata.cpp branches/0.18/src/node/x3d-geospatial/geo_metadata.h branches/0.18/src/node/x3d-geospatial/geo_origin.cpp branches/0.18/src/node/x3d-geospatial/geo_origin.h branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.cpp branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.h branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.cpp branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.h branches/0.18/src/node/x3d-geospatial/geo_viewpoint.cpp branches/0.18/src/node/x3d-geospatial/geo_viewpoint.h branches/0.18/src/node/x3d-geospatial/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/static_group.cpp branches/0.18/src/node/x3d-grouping/static_group.h branches/0.18/src/node/x3d-h-anim/h_anim_displacer.cpp branches/0.18/src/node/x3d-h-anim/h_anim_displacer.h branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.cpp branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.h branches/0.18/src/node/x3d-h-anim/h_anim_joint.cpp branches/0.18/src/node/x3d-h-anim/h_anim_joint.h branches/0.18/src/node/x3d-h-anim/h_anim_segment.cpp branches/0.18/src/node/x3d-h-anim/h_anim_segment.h branches/0.18/src/node/x3d-h-anim/h_anim_site.cpp branches/0.18/src/node/x3d-h-anim/h_anim_site.h branches/0.18/src/node/x3d-h-anim/register_node_metatypes.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.h branches/0.18/src/node/x3d-interpolation/position_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/position_interpolator2d.h branches/0.18/src/node/x3d-interpolation/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.h branches/0.18/src/node/x3d-key-device-sensor/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.h branches/0.18/src/node/x3d-networking/load_sensor.cpp branches/0.18/src/node/x3d-networking/load_sensor.h branches/0.18/src/node/x3d-networking/register_node_metatypes.cpp branches/0.18/src/node/x3d-nurbs/contour2d.cpp branches/0.18/src/node/x3d-nurbs/contour2d.h branches/0.18/src/node/x3d-nurbs/contour_polyline2d.cpp branches/0.18/src/node/x3d-nurbs/contour_polyline2d.h branches/0.18/src/node/x3d-nurbs/coordinate_double.cpp branches/0.18/src/node/x3d-nurbs/coordinate_double.h branches/0.18/src/node/x3d-nurbs/nurbs_curve.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve.h branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.h branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_set.cpp branches/0.18/src/node/x3d-nurbs/nurbs_set.h branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.h branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.h branches/0.18/src/node/x3d-nurbs/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/color_rgba.cpp branches/0.18/src/node/x3d-rendering/color_rgba.h branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.h branches/0.18/src/node/x3d-rendering/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.h branches/0.18/src/node/x3d-rendering/triangle_set.cpp branches/0.18/src/node/x3d-rendering/triangle_set.h branches/0.18/src/node/x3d-rendering/triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/triangle_strip_set.h branches/0.18/src/node/x3d-shape/fill_properties.cpp branches/0.18/src/node/x3d-shape/fill_properties.h branches/0.18/src/node/x3d-shape/line_properties.cpp branches/0.18/src/node/x3d-shape/line_properties.h branches/0.18/src/node/x3d-shape/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/multi_texture.cpp branches/0.18/src/node/x3d-texturing/multi_texture.h branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.cpp branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.h branches/0.18/src/node/x3d-texturing/multi_texture_transform.cpp branches/0.18/src/node/x3d-texturing/multi_texture_transform.h branches/0.18/src/node/x3d-texturing/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.h Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2009-10-24 06:54:03 UTC (rev 4011) +++ branches/0.18/ChangeLog 2009-10-24 06:57:11 UTC (rev 4012) @@ -1,3 +1,7 @@ +2009-10-24 Braden McDaniel <br...@en...> + + * configure.ac: Clean up legacy cruft in handling of GRE_PATH. + 2009-10-19 Braden McDaniel <br...@en...> * src/node/vrml97/collision.cpp Modified: branches/0.18/configure.ac =================================================================== --- branches/0.18/configure.ac 2009-10-24 06:54:03 UTC (rev 4011) +++ branches/0.18/configure.ac 2009-10-24 06:57:11 UTC (rev 4012) @@ -23,7 +23,7 @@ [openvrml.pc]) AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE([1.10.1 foreign subdir-objects check-news tar-pax]) +AM_INIT_AUTOMAKE([1.10.1 gnits subdir-objects check-news tar-pax]) AM_CONFIG_HEADER([config.h]) # @@ -495,15 +495,15 @@ # Determine whether to apply the -rpath for the Gecko runtime libraries. # AS_IF([test "X$enable_gecko_rpath" = Xyes], -[AS_IF([test -z "$GRE_PATH"], +[AS_IF([test $GRE_PATH], [GRE_PATH=`echo $JS_LIBS | sed -e 's/^-L\([[^ ]]*\).*/\1/'` AS_IF([test "X$GRE_PATH" = "X$JS_LIBS"], [GRE_PATH="" - AC_MSG_ERROR([GRE_PATH could not be derived from JS_LIBS. Set GRE_PATH if executables linking with libopenvrml should be built with an -rpath for the Gecko runtime libraries.])])]) + AC_MSG_ERROR([GRE_PATH could not be derived from JS_LIBS. Set GRE_PATH if an -rpath is needed to locate the Gecko runtime libraries at runtime.])])]) AS_IF([test -n "${openvrml_js_run_path}" -a -n "${GRE_PATH}"], [openvrml_js_run_path=":${openvrml_js_run_path}"]) openvrml_js_run_path="${GRE_PATH}${openvrml_js_run_path}" -OPENVRML_JAVASCRIPT_RPATH="-Wl,-rpath -Wl,${openvrml_js_run_path}" +OPENVRML_JAVASCRIPT_RPATH="-Wl,-rpath -Wl,${GRE_PATH}" ]) AC_SUBST([OPENVRML_JAVASCRIPT_RPATH]) Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/libopenvrml/openvrml/script.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/mozilla-plugin ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/vrml97/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-core/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-dis/transmitter_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/transmitter_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 /trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 /trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-environmental-effects/texture_background.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 /trunk/src/node/x3d-environmental-effects/texture_background.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_filter.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_filter.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_toggle.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/boolean_trigger.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_sequencer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011 Property changes on: branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005 + /branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 /trunk/src/node/x3d-event-utilities/integer_trigger.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3... [truncated message content] |