Merge branch 'integration-1.2' of...

Merge branch 'integration-1.2' of git+ssh://scm.gforge.inria.fr//gitroot/openvibe/openvibe into wip-jlindgre-debug-baddrawable

applications/demos/ssvep-mind-shooter/src/Impact/dotscene/DotSceneLoader.cpp

@@ -1443,7 +1443,7 @@ Ogre::String DotSceneLoader::getProperty(const Ogre::String &ndNm, const Ogre::S
 void DotSceneLoader::processUserDataReference(rapidxml::xml_node<>* XMLNode, Ogre::Entity *pEntity)
 {
 	Ogre::String str = XMLNode->first_attribute("id")->value();
-	pEntity->setUserAny(Ogre::Any(str));
+	pEntity->getUserObjectBindings().setUserAny(Ogre::Any(str));
 }
 
-#endif
\ No newline at end of file
+#endif

contrib/plugins/server-extensions/tcp-tagging/test/test_tagstream.cpp

@@ -9,6 +9,9 @@ int main()
 
 	CTagStream tagStream1;
 
+#ifdef _WIN32
+	ok=true;
+#else
 	try {
 		// The construction of the second TagStream must fail because of port already in use.
 		CTagStream tagStream2;
@@ -16,6 +19,7 @@ int main()
 	catch( std::exception& ) {
 		ok=true;
 	}
+#endif
 
 	// The construction must succeed because another port is used.
 	CTagStream tagStream3(15362);