Merge branch 'master' into develop

Anders Modén · Anders Modén · commit 261248f9957d · 2019-09-23T22:01:39.000+02:00
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ Good Luck !
 Technology Info
 ===============
 
-The demo is based on GizmoDistribution SDK that is part of the GizmoSDK. It will allow a HLA/DIS/CORBA alike API for C#
+The demo is based on GizmoDistribution SDK that is part of the GizmoSDK. It will allow a HLA/DIS/CORBA alike API for C# but at the same time compatible with C++ native API, enabling a transparent data exchange between native C++ and C# in high speed.
 
 You can take a look at http://www.gizmosdk.se/html/distrdoc.htm for more info! It is also structured to be used in Unity3D.
 
@@ -144,3 +144,4 @@ We tried to make an easy to use API but also very high performance
             }
         }
     }
+```

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ Good Luck !`
`23`	`23`	`Technology Info`
`24`	`24`	`===============`
`25`	`25`
`26`		`-The demo is based on GizmoDistribution SDK that is part of the GizmoSDK. It will allow a HLA/DIS/CORBA alike API for C#`
	`26`	`+The demo is based on GizmoDistribution SDK that is part of the GizmoSDK. It will allow a HLA/DIS/CORBA alike API for C# but at the same time compatible with C++ native API, enabling a transparent data exchange between native C++ and C# in high speed.`
`27`	`27`
`28`	`28`	`You can take a look at http://www.gizmosdk.se/html/distrdoc.htm for more info! It is also structured to be used in Unity3D.`
`29`	`29`
`@@ -144,3 +144,4 @@ We tried to make an easy to use API but also very high performance`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`	`}`
	`147`	+```