comparaison mod
comparaison mod
comparaison change
comparaison mod
Merge branch 'master' of github.com:jpmerc/perception3d

Conflicts:
	gtest-1.7.0/CMakeCache.txt
	gtest-1.7.0/CMakeFiles/CMakeCCompiler.cmake
	gtest-1.7.0/CMakeFiles/CMakeDetermineCompilerABI_C.bin
	gtest-1.7.0/CMakeFiles/CMakeDetermineCompilerABI_CXX.bin
	gtest-1.7.0/CMakeFiles/CMakeDirectoryInformation.cmake
	gtest-1.7.0/CMakeFiles/CMakeError.log
	gtest-1.7.0/CMakeFiles/CMakeOutput.log
	gtest-1.7.0/CMakeFiles/CMakeSystem.cmake
	gtest-1.7.0/CMakeFiles/CompilerIdC/a.out
	gtest-1.7.0/CMakeFiles/CompilerIdCXX/a.out
	gtest-1.7.0/CMakeFiles/Makefile2
	gtest-1.7.0/CMakeFiles/TargetDirectories.txt
	gtest-1.7.0/CMakeFiles/gtest.dir/CXX.includecache
	gtest-1.7.0/CMakeFiles/gtest.dir/DependInfo.cmake
	gtest-1.7.0/CMakeFiles/gtest.dir/build.make
	gtest-1.7.0/CMakeFiles/gtest.dir/depend.internal
	gtest-1.7.0/CMakeFiles/gtest.dir/flags.make
	gtest-1.7.0/CMakeFiles/gtest.dir/src/gtest-all.cc.o
	gtest-1.7.0/CMakeFiles/gtest_main.dir/CXX.includecache
	gtest-1.7.0/CMakeFiles/gtest_main.dir/DependInfo.cmake
	gtest-1.7.0/CMakeFiles/gtest_main.dir/build.make
	gtest-1.7.0/CMakeFiles/gtest_main.dir/depend.internal
	gtest-1.7.0/CMakeFiles/gtest_main.dir/flags.make
	gtest-1.7.0/CMakeFiles/gtest_main.dir/src/gtest_main.cc.o
	gtest-1.7.0/Makefile
	gtest-1.7.0/cmake_install.cmake
	gtest-1.7.0/libgtest.a
	gtest-1.7.0/libgtest_main.a
	src/perception/communication.cpp