Merge with default

diff --cc boards/generic/EcuM_Cfg.h
index 8d35c11287d8544cc9b5d6f9c7dbf66d21c7bfa7,ef247d6bbdd033c5daf3db6bce7d1cebf9c98f4a..ccc72d8d3896945dd1c08b5dbad005177561d551
--- 1/boards/generic/EcuM_Cfg.h
--- 2/boards/generic/EcuM_Cfg.h
+++ b/boards/generic/EcuM_Cfg.h
@@@ -12,13 -12,13 +12,13 @@@
   *           on Thu Oct 14 15:29:52 CEST 2010\r
   */\r
  \r
--
++\r
  #warning "This default file may only be used as an example!"\r
  \r
--#if (ECUM_SW_MAJOR_VERSION != 1) 
--#error "EcuM: Configuration file version differs from BSW version."
--#endif
--
++#if (ECUM_SW_MAJOR_VERSION != 1) \r
++#error "EcuM: Configuration file version differs from BSW version."\r
++#endif\r
++\r
  \r
  \r
  #ifndef ECUM_CFG_H_\r