Menu
▾
▴
SF.net SVN: openvrml:[3957] trunk
|
From: <br...@us...> - 2009-07-07 03:41:32
|
Revision: 3957
http://openvrml.svn.sourceforge.net/openvrml/?rev=3957&view=rev
Author: braden
Date: 2009-07-07 03:41:28 +0000 (Tue, 07 Jul 2009)
Log Message:
-----------
Updates for 0.18.1 release.
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
trunk/README
trunk/configure.ac
trunk/doc/Doxyfile
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc
trunk/src/Makefile.am
Property Changed:
----------------
trunk/
trunk/src/libopenvrml/openvrml/bad_url.cpp
trunk/src/libopenvrml/openvrml/bad_url.h
trunk/src/libopenvrml/openvrml/local/proto.cpp
trunk/src/libopenvrml/openvrml/local/proto.h
trunk/src/libopenvrml/openvrml/scene.cpp
trunk/src/libopenvrml/openvrml/scene.h
trunk/src/libopenvrml/openvrml/script.cpp
trunk/src/mozilla-plugin/
trunk/src/node/vrml97/register_node_metatypes.cpp
trunk/src/node/x3d-cad-geometry/cad_face.cpp
trunk/src/node/x3d-cad-geometry/cad_face.h
trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp
trunk/src/node/x3d-cad-geometry/indexed_quad_set.h
trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp
trunk/src/node/x3d-core/metadata_double.cpp
trunk/src/node/x3d-core/metadata_double.h
trunk/src/node/x3d-core/metadata_float.cpp
trunk/src/node/x3d-core/metadata_float.h
trunk/src/node/x3d-core/metadata_integer.cpp
trunk/src/node/x3d-core/metadata_integer.h
trunk/src/node/x3d-core/metadata_set.cpp
trunk/src/node/x3d-core/metadata_set.h
trunk/src/node/x3d-core/metadata_string.cpp
trunk/src/node/x3d-core/metadata_string.h
trunk/src/node/x3d-core/register_node_metatypes.cpp
trunk/src/node/x3d-dis/espdu_transform.cpp
trunk/src/node/x3d-dis/espdu_transform.h
trunk/src/node/x3d-dis/receiver_pdu.cpp
trunk/src/node/x3d-dis/receiver_pdu.h
trunk/src/node/x3d-dis/register_node_metatypes.cpp
trunk/src/node/x3d-dis/signal_pdu.cpp
trunk/src/node/x3d-dis/signal_pdu.h
trunk/src/node/x3d-dis/transmitter_pdu.cpp
trunk/src/node/x3d-dis/transmitter_pdu.h
trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp
trunk/src/node/x3d-environmental-effects/texture_background.cpp
trunk/src/node/x3d-environmental-effects/texture_background.h
trunk/src/node/x3d-event-utilities/boolean_filter.cpp
trunk/src/node/x3d-event-utilities/boolean_filter.h
trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp
trunk/src/node/x3d-event-utilities/boolean_sequencer.h
trunk/src/node/x3d-event-utilities/boolean_toggle.cpp
trunk/src/node/x3d-event-utilities/boolean_toggle.h
trunk/src/node/x3d-event-utilities/boolean_trigger.cpp
trunk/src/node/x3d-event-utilities/boolean_trigger.h
trunk/src/node/x3d-event-utilities/integer_sequencer.cpp
trunk/src/node/x3d-event-utilities/integer_sequencer.h
trunk/src/node/x3d-event-utilities/integer_trigger.cpp
trunk/src/node/x3d-event-utilities/integer_trigger.h
trunk/src/node/x3d-event-utilities/register_node_metatypes.cpp
trunk/src/node/x3d-event-utilities/time_trigger.cpp
trunk/src/node/x3d-event-utilities/time_trigger.h
trunk/src/node/x3d-geometry2d/arc2d.cpp
trunk/src/node/x3d-geometry2d/arc2d.h
trunk/src/node/x3d-geometry2d/arc_close2d.cpp
trunk/src/node/x3d-geometry2d/arc_close2d.h
trunk/src/node/x3d-geometry2d/circle2d.cpp
trunk/src/node/x3d-geometry2d/circle2d.h
trunk/src/node/x3d-geometry2d/disk2d.cpp
trunk/src/node/x3d-geometry2d/disk2d.h
trunk/src/node/x3d-geometry2d/polyline2d.cpp
trunk/src/node/x3d-geometry2d/polyline2d.h
trunk/src/node/x3d-geometry2d/polypoint2d.cpp
trunk/src/node/x3d-geometry2d/polypoint2d.h
trunk/src/node/x3d-geometry2d/rectangle2d.cpp
trunk/src/node/x3d-geometry2d/rectangle2d.h
trunk/src/node/x3d-geometry2d/register_node_metatypes.cpp
trunk/src/node/x3d-geometry2d/triangle_set2d.cpp
trunk/src/node/x3d-geometry2d/triangle_set2d.h
trunk/src/node/x3d-geospatial/geo_coordinate.cpp
trunk/src/node/x3d-geospatial/geo_coordinate.h
trunk/src/node/x3d-geospatial/geo_elevation_grid.cpp
trunk/src/node/x3d-geospatial/geo_elevation_grid.h
trunk/src/node/x3d-geospatial/geo_location.cpp
trunk/src/node/x3d-geospatial/geo_location.h
trunk/src/node/x3d-geospatial/geo_lod.cpp
trunk/src/node/x3d-geospatial/geo_lod.h
trunk/src/node/x3d-geospatial/geo_metadata.cpp
trunk/src/node/x3d-geospatial/geo_metadata.h
trunk/src/node/x3d-geospatial/geo_origin.cpp
trunk/src/node/x3d-geospatial/geo_origin.h
trunk/src/node/x3d-geospatial/geo_position_interpolator.cpp
trunk/src/node/x3d-geospatial/geo_position_interpolator.h
trunk/src/node/x3d-geospatial/geo_touch_sensor.cpp
trunk/src/node/x3d-geospatial/geo_touch_sensor.h
trunk/src/node/x3d-geospatial/geo_viewpoint.cpp
trunk/src/node/x3d-geospatial/geo_viewpoint.h
trunk/src/node/x3d-geospatial/register_node_metatypes.cpp
trunk/src/node/x3d-grouping/register_node_metatypes.cpp
trunk/src/node/x3d-grouping/static_group.cpp
trunk/src/node/x3d-grouping/static_group.h
trunk/src/node/x3d-h-anim/h_anim_displacer.cpp
trunk/src/node/x3d-h-anim/h_anim_displacer.h
trunk/src/node/x3d-h-anim/h_anim_humanoid.cpp
trunk/src/node/x3d-h-anim/h_anim_humanoid.h
trunk/src/node/x3d-h-anim/h_anim_joint.cpp
trunk/src/node/x3d-h-anim/h_anim_joint.h
trunk/src/node/x3d-h-anim/h_anim_segment.cpp
trunk/src/node/x3d-h-anim/h_anim_segment.h
trunk/src/node/x3d-h-anim/h_anim_site.cpp
trunk/src/node/x3d-h-anim/h_anim_site.h
trunk/src/node/x3d-h-anim/register_node_metatypes.cpp
trunk/src/node/x3d-interpolation/coordinate_interpolator2d.cpp
trunk/src/node/x3d-interpolation/coordinate_interpolator2d.h
trunk/src/node/x3d-interpolation/position_interpolator2d.cpp
trunk/src/node/x3d-interpolation/position_interpolator2d.h
trunk/src/node/x3d-interpolation/register_node_metatypes.cpp
trunk/src/node/x3d-key-device-sensor/key_sensor.cpp
trunk/src/node/x3d-key-device-sensor/key_sensor.h
trunk/src/node/x3d-key-device-sensor/register_node_metatypes.cpp
trunk/src/node/x3d-key-device-sensor/string_sensor.cpp
trunk/src/node/x3d-key-device-sensor/string_sensor.h
trunk/src/node/x3d-networking/load_sensor.cpp
trunk/src/node/x3d-networking/load_sensor.h
trunk/src/node/x3d-networking/register_node_metatypes.cpp
trunk/src/node/x3d-nurbs/contour2d.cpp
trunk/src/node/x3d-nurbs/contour2d.h
trunk/src/node/x3d-nurbs/contour_polyline2d.cpp
trunk/src/node/x3d-nurbs/contour_polyline2d.h
trunk/src/node/x3d-nurbs/coordinate_double.cpp
trunk/src/node/x3d-nurbs/coordinate_double.h
trunk/src/node/x3d-nurbs/nurbs_curve.cpp
trunk/src/node/x3d-nurbs/nurbs_curve.h
trunk/src/node/x3d-nurbs/nurbs_curve2d.cpp
trunk/src/node/x3d-nurbs/nurbs_curve2d.h
trunk/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp
trunk/src/node/x3d-nurbs/nurbs_orientation_interpolator.h
trunk/src/node/x3d-nurbs/nurbs_patch_surface.cpp
trunk/src/node/x3d-nurbs/nurbs_patch_surface.h
trunk/src/node/x3d-nurbs/nurbs_position_interpolator.cpp
trunk/src/node/x3d-nurbs/nurbs_position_interpolator.h
trunk/src/node/x3d-nurbs/nurbs_set.cpp
trunk/src/node/x3d-nurbs/nurbs_set.h
trunk/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp
trunk/src/node/x3d-nurbs/nurbs_surface_interpolator.h
trunk/src/node/x3d-nurbs/nurbs_swept_surface.cpp
trunk/src/node/x3d-nurbs/nurbs_swept_surface.h
trunk/src/node/x3d-nurbs/nurbs_swung_surface.cpp
trunk/src/node/x3d-nurbs/nurbs_swung_surface.h
trunk/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp
trunk/src/node/x3d-nurbs/nurbs_texture_coordinate.h
trunk/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp
trunk/src/node/x3d-nurbs/nurbs_trimmed_surface.h
trunk/src/node/x3d-nurbs/register_node_metatypes.cpp
trunk/src/node/x3d-rendering/color_rgba.cpp
trunk/src/node/x3d-rendering/color_rgba.h
trunk/src/node/x3d-rendering/indexed_triangle_fan_set.cpp
trunk/src/node/x3d-rendering/indexed_triangle_fan_set.h
trunk/src/node/x3d-rendering/indexed_triangle_set.cpp
trunk/src/node/x3d-rendering/indexed_triangle_set.h
trunk/src/node/x3d-rendering/indexed_triangle_strip_set.cpp
trunk/src/node/x3d-rendering/indexed_triangle_strip_set.h
trunk/src/node/x3d-rendering/register_node_metatypes.cpp
trunk/src/node/x3d-rendering/triangle_fan_set.cpp
trunk/src/node/x3d-rendering/triangle_fan_set.h
trunk/src/node/x3d-rendering/triangle_set.cpp
trunk/src/node/x3d-rendering/triangle_set.h
trunk/src/node/x3d-rendering/triangle_strip_set.cpp
trunk/src/node/x3d-rendering/triangle_strip_set.h
trunk/src/node/x3d-shape/fill_properties.cpp
trunk/src/node/x3d-shape/fill_properties.h
trunk/src/node/x3d-shape/line_properties.cpp
trunk/src/node/x3d-shape/line_properties.h
trunk/src/node/x3d-shape/register_node_metatypes.cpp
trunk/src/node/x3d-texturing/multi_texture.cpp
trunk/src/node/x3d-texturing/multi_texture.h
trunk/src/node/x3d-texturing/multi_texture_coordinate.cpp
trunk/src/node/x3d-texturing/multi_texture_coordinate.h
trunk/src/node/x3d-texturing/multi_texture_transform.cpp
trunk/src/node/x3d-texturing/multi_texture_transform.h
trunk/src/node/x3d-texturing/register_node_metatypes.cpp
trunk/src/node/x3d-texturing/texture_coordinate_generator.cpp
trunk/src/node/x3d-texturing/texture_coordinate_generator.h
Property changes on: trunk
___________________________________________________________________
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/0.18:3951,3953
/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/0.18:3951,3953,3955
/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
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-07-05 21:20:09 UTC (rev 3956)
+++ trunk/ChangeLog 2009-07-07 03:41:28 UTC (rev 3957)
@@ -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: trunk/NEWS
===================================================================
--- trunk/NEWS 2009-07-05 21:20:09 UTC (rev 3956)
+++ trunk/NEWS 2009-07-07 03:41:28 UTC (rev 3957)
@@ -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: trunk/README
===================================================================
--- trunk/README 2009-07-05 21:20:09 UTC (rev 3956)
+++ trunk/README 2009-07-07 03:41:28 UTC (rev 3957)
@@ -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: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2009-07-05 21:20:09 UTC (rev 3956)
+++ trunk/configure.ac 2009-07-07 03:41:28 UTC (rev 3957)
@@ -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: trunk/doc/Doxyfile
===================================================================
--- trunk/doc/Doxyfile 2009-07-05 21:20:09 UTC (rev 3956)
+++ trunk/doc/Doxyfile 2009-07-07 03:41:28 UTC (rev 3957)
@@ -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: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc 2009-07-05 21:20:09 UTC (rev 3956)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc 2009-07-07 03:41:28 UTC (rev 3957)
@@ -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: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj 2009-07-05 21:20:09 UTC (rev 3956)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj 2009-07-07 03:41:28 UTC (rev 3957)
@@ -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: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc 2009-07-05 21:20:09 UTC (rev 3956)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc 2009-07-07 03:41:28 UTC (rev 3957)
@@ -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: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2009-07-05 21:20:09 UTC (rev 3956)
+++ trunk/src/Makefile.am 2009-07-07 03:41:28 UTC (rev 3957)
@@ -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
# | | |
# +------+ | +---+
Property changes on: trunk/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/0.18/src/libopenvrml/openvrml/bad_url.cpp:3951,3953
/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/0.18/src/libopenvrml/openvrml/bad_url.cpp:3951,3953,3955
/branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801
Property changes on: trunk/src/libopenvrml/openvrml/bad_url.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/libopenvrml/openvrml/bad_url.h:3951,3953
/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/0.18/src/libopenvrml/openvrml/bad_url.h:3951,3953,3955
/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
Property changes on: trunk/src/libopenvrml/openvrml/local/proto.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/libopenvrml/openvrml/local/proto.cpp:3951,3953
/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/0.18/src/libopenvrml/openvrml/local/proto.cpp:3951,3953,3955
/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
Property changes on: trunk/src/libopenvrml/openvrml/local/proto.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/libopenvrml/openvrml/local/proto.h:3951,3953
/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/0.18/src/libopenvrml/openvrml/local/proto.h:3951,3953,3955
/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
Property changes on: trunk/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/0.18/src/libopenvrml/openvrml/scene.cpp:3951,3953
/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/0.18/src/libopenvrml/openvrml/scene.cpp:3951,3953,3955
/branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801
Property changes on: trunk/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/0.18/src/libopenvrml/openvrml/scene.h:3951,3953
/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/0.18/src/libopenvrml/openvrml/scene.h:3951,3953,3955
/branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801
Property changes on: trunk/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/0.18/src/libopenvrml/openvrml/script.cpp:3951,3953
/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/0.18/src/libopenvrml/openvrml/script.cpp:3951,3953,3955
/branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801
Property changes on: trunk/src/mozilla-plugin
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/mozilla-plugin:3951,3953
+ /branches/0.18/src/mozilla-plugin:3951,3953,3955
Property changes on: trunk/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/0.18/src/node/vrml97/register_node_metatypes.cpp:3951,3953
/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/0.18/src/node/vrml97/register_node_metatypes.cpp:3951,3953,3955
/branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734
Property changes on: trunk/src/node/x3d-cad-geometry/cad_face.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp:3951,3953
/branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630
+ /branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp:3951,3953,3955
/branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630
Property changes on: trunk/src/node/x3d-cad-geometry/cad_face.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-cad-geometry/cad_face.h:3951,3953
/branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630
+ /branches/0.18/src/node/x3d-cad-geometry/cad_face.h:3951,3953,3955
/branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630
Property changes on: trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3951,3953
/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/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3951,3953,3955
/branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630
Property changes on: trunk/src/node/x3d-cad-geometry/indexed_quad_set.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h:3951,3953
/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/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h:3951,3953,3955
/branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630
Property changes on: trunk/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/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3951,3953
/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/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3951,3953,3955
/branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734
Property changes on: trunk/src/node/x3d-core/metadata_double.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-core/metadata_double.cpp:3951,3953
/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/0.18/src/node/x3d-core/metadata_double.cpp:3951,3953,3955
/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
Property changes on: trunk/src/node/x3d-core/metadata_double.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-core/metadata_double.h:3951,3953
/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/0.18/src/node/x3d-core/metadata_double.h:3951,3953,3955
/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
Property changes on: trunk/src/node/x3d-core/metadata_float.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-core/metadata_float.cpp:3951,3953
/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/0.18/src/node/x3d-core/metadata_float.cpp:3951,3953,3955
/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
Property changes on: trunk/src/node/x3d-core/metadata_float.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-core/metadata_float.h:3951,3953
/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/0.18/src/node/x3d-core/metadata_float.h:3951,3953,3955
/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
Property changes on: trunk/src/node/x3d-core/metadata_integer.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-core/metadata_integer.cpp:3951,3953
/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/0.18/src/node/x3d-core/metadata_integer.cpp:3951,3953,3955
/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
Property changes on: trunk/src/node/x3d-core/metadata_integer.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-core/metadata_integer.h:3951,3953
/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/0.18/src/node/x3d-core/metadata_integer.h:3951,3953,3955
/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
Property changes on: trunk/src/node/x3d-core/metadata_set.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-core/metadata_set.cpp:3951,3953
/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/0.18/src/node/x3d-core/metadata_set.cpp:3951,3953,3955
/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
Property changes on: trunk/src/node/x3d-core/metadata_set.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-core/metadata_set.h:3951,3953
/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/0.18/src/node/x3d-core/metadata_set.h:3951,3953,3955
/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
Property changes on: trunk/src/node/x3d-core/metadata_string.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-core/metadata_string.cpp:3951,3953
/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/0.18/src/node/x3d-core/metadata_string.cpp:3951,3953,3955
/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
Property changes on: trunk/src/node/x3d-core/metadata_string.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-core/metadata_string.h:3951,3953
/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/0.18/src/node/x3d-core/metadata_string.h:3951,3953,3955
/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
Property changes on: trunk/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/0.18/src/node/x3d-core/register_node_metatypes.cpp:3951,3953
/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/0.18/src/node/x3d-core/register_node_metatypes.cpp:3951,3953,3955
/branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734
Property changes on: trunk/src/node/x3d-dis/espdu_transform.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-dis/espdu_transform.cpp:3951,3953
/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/0.18/src/node/x3d-dis/espdu_transform.cpp:3951,3953,3955
/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
Property changes on: trunk/src/node/x3d-dis/espdu_transform.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-dis/espdu_transform.h:3951,3953
/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/0.18/src/node/x3d-dis/espdu_transform.h:3951,3953,3955
/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
Property changes on: trunk/src/node/x3d-dis/receiver_pdu.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-dis/receiver_pdu.cpp:3951,3953
/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/0.18/src/node/x3d-dis/receiver_pdu.cpp:3951,3953,3955
/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
Property changes on: trunk/src/node/x3d-dis/receiver_pdu.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-dis/receiver_pdu.h:3951,3953
/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/0.18/src/node/x3d-dis/receiver_pdu.h:3951,3953,3955
/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
Property changes on: trunk/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/0.18/src/node/x3d-dis/register_node_metatypes.cpp:3951,3953
/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/0.18/src/node/x3d-dis/register_node_metatypes.cpp:3951,3953,3955
/branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734
Property changes on: trunk/src/node/x3d-dis/signal_pdu.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-dis/signal_pdu.cpp:3951,3953
/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/0.18/src/node/x3d-dis/signal_pdu.cpp:3951,3953,3955
/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
Property changes on: trunk/src/node/x3d-dis/signal_pdu.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-dis/signal_pdu.h:3951,3953
/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/0.18/src/node/x3d-dis/signal_pdu.h:3951,3953,3955
/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
Property changes on: trunk/src/node/x3d-dis/transmitter_pdu.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp:3951,3953
/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/0.18/src/node/x3d-dis/transmitter_pdu.cpp:3951,3953,3955
/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
Property changes on: trunk/src/node/x3d-dis/transmitter_pdu.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-dis/transmitter_pdu.h:3951,3953
/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/0.18/src/node/x3d-dis/transmitter_pdu.h:3951,3953,3955
/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
Property changes on: trunk/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/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3951,3953
/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/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3951,3953,3955
/branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734
Property changes on: trunk/src/node/x3d-environmental-effects/texture_background.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp:3951,3953
/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/0.18/src/node/x3d-environmental-effects/texture_background.cpp:3951,3953,3955
/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
Property changes on: trunk/src/node/x3d-environmental-effects/texture_background.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-environmental-effects/texture_background.h:3951,3953
/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/0.18/src/node/x3d-environmental-effects/texture_background.h:3951,3953,3955
/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
Property changes on: trunk/src/node/x3d-event-utilities/boolean_filter.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp:3951,3953
/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/0.18/src/node/x3d-event-utilities/boolean_filter.cpp:3951,3953,3955
/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
Property changes on: trunk/src/node/x3d-event-utilities/boolean_filter.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-event-utilities/boolean_filter.h:3951,3953
/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/0.18/src/node/x3d-event-utilities/boolean_filter.h:3951,3953,3955
/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
Property changes on: trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp:3951,3953
/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/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp:3951,3953,3955
/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
Property changes on: trunk/src/node/x3d-event-utilities/boolean_sequencer.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h:3951,3953
/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/0.18/src/node/x3d-event-utilities/boolean_sequencer.h:3951,3953,3955
/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
Property changes on: trunk/src/node/x3d-event-utilities/boolean_toggle.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp:3951,3953
/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/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp:3951,3953,3955
/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
Property changes on: trunk/src/node/x3d-event-utilities/boolean_toggle.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h:3951,3953
/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/0.18/src/node/x3d-event-utilities/boolean_toggle.h:3951,3953,3955
/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
Property changes on: trunk/src/node/x3d-event-utilities/boolean_trigger.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp:3951,3953
/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/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp:3951,3953,3955
/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
Property changes on: trunk/src/node/x3d-event-utilities/boolean_trigger.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h:3951,3953
/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/0.18/src/node/x3d-event-utilities/boolean_trigger.h:3951,3953,3955
/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
Property changes on: trunk/src/node/x3d-event-utilities/integer_sequencer.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp:3951,3953
/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/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp:3951,3953,3955
/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
Property changes on: trunk/src/node/x3d-event-utilities/integer_sequencer.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h:3951,3953
/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/0.18/src/node/x3d-event-utilities/integer_sequencer.h:3951,3953,3955
/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
Property changes on: trunk/src/node/x3d-event-utilities/integer_trigger.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp:3951,3953
/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/0.18/src/node/x3d-event-utilities/integer_trigger.cpp:3951,3953,3955
/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
Property changes on: trunk/src/node/x3d-event-utilities/integer_trigger.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-event-utilities/integer_trigger.h:3951,3953
/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/0.18/src/node/x3d-event-utilities/integer_trigger.h:3951,3953,3955
/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
Property changes on: trunk/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/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp:3951,3953
/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/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp:3951,3953,3955
/branches/local/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3734
Property changes on: trunk/src/node/x3d-event-utilities/time_trigger.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp:3951,3953
/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/0.18/src/node/x3d-event-utilities/time_trigger.cpp:3951,3953,3955
/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
Property changes on: trunk/src/node/x3d-event-utilities/time_trigger.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-event-utilities/time_trigger.h:3951,3953
/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/0.18/src/node/x3d-event-utilities/time_trigger.h:3951,3953,3955
/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
Property changes on: trunk/src/node/x3d-geometry2d/arc2d.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.18/src/node/x3d-geometry2d/arc2d.cpp:3951,3953
/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/0.18/src/node/x3d-geometry2d/arc2d.cpp:3951,3953,3955
/branches/local/src/node/x3d-geometry2d/arc2d.c...
[truncated message content] |
