Menu
▾
▴
SF.net SVN: openvrml:[3986] branches/0.18
|
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] |
