modified:   README.md
	modified:   Readme/HACKING
	modified:   CMake/CMakeCpack.cmake
	modified:   CMakeLists.txt
	modified:   Code/Comms/Drivers/CMakeLists.txt
	modified:   Doc/CMake/Doxyfile.in
	modified:   Doc/CMakeLists.txt
	modified:   Doc/MainPage.h
	modified:   Readme/LICENSE.txt
	modified:   Tests/Comms/Drivers/tcp_test.cc
	modified:   Code/Comms/Drivers/CMakeLists.txt
mantener las flags -Werror para comms/drivers
Merge branch 'experimental_cmake' into experimental
Merge branch 'experimental' into development
	modified:   Code/Comms/Drivers/Ethernet/ciaa_qtcpsocket_adapter.cc
	modified:   Code/Comms/Drivers/SerialPort/ciaa_qserialport_adapter.cc
	modified:   Code/Comms/Drivers/ciaa_comm_adapter_interface.h
	modified:   Code/Comms/Drivers/ciaa_comm_driver_error_code.h
	modified:   Code/Comms/Drivers/ciaa_comm_facade.h
resueltos conflictos del merge
	modified:   Code/Comms/Drivers/ciaa_comm_driver_error_code.h
Merge https://github.com/ciaa/Software into development
pull antes de subir
	modified:   Tests/Comms/Drivers/tcp_test.cc
Semiterminado el archivo de pruebas para comms_drivres_tcp
agregados los permisos correspondientes a los archivos al instalarse
agregado el .desktop
	modified:   CMake/CMakeCpack.cmake
	new file:   CMake/ciaaSoftware.desktop.in
	new file:   CMake/ciaaSoftware.png
	modified:   CMakeLists.txt
	modified:   Code/GUI/CMakeLists.txt
	modified:   Tests/Comms/Drivers/tcp_test.cc
Merge branch 'development_comms' into development