Commit 6ff7a2ff authored by Dipl.-Ing. Jonas Stienen's avatar Dipl.-Ing. Jonas Stienen
Browse files

Merge branch 'develop' of https://git.rwth-aachen.de/ita/VANet into develop

parents 8c82ff7a 2f4a32db
...@@ -6,11 +6,11 @@ list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" ) ...@@ -6,11 +6,11 @@ list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
include( VistaCommon ) include( VistaCommon )
if( NOT DEFINED ITA_VANET_VERSION_MAJOR ) if( NOT DEFINED ITA_VANET_VERSION_MAJOR )
set( ITA_VANET_VERSION_MAJOR "v2018" CACHE STRING "VANet version major (usually 'v' and year)" ) set( ITA_VANET_VERSION_MAJOR "v2019" CACHE STRING "VANet version major (usually 'v' and year)" )
endif( ) endif( )
if( NOT DEFINED ITA_VANET_VERSION_MINOR ) if( NOT DEFINED ITA_VANET_VERSION_MINOR )
set( ITA_VANET_VERSION_MINOR "b" CACHE STRING "VANet version minor (usually a,b,c ...)" ) set( ITA_VANET_VERSION_MINOR "a" CACHE STRING "VANet version minor (usually a,b,c ...)" )
endif( ) endif( )
if( NOT DEFINED ITA_VANET_DEFAULT_PORT ) if( NOT DEFINED ITA_VANET_DEFAULT_PORT )
......
...@@ -894,5 +894,5 @@ void CVANetServerImpl::HandleClientEvent( int iEventID, VistaConnectionIP* pConn ...@@ -894,5 +894,5 @@ void CVANetServerImpl::HandleClientEvent( int iEventID, VistaConnectionIP* pConn
#endif #endif
break; break;
} }
} }
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment