Merge branch 'myTestBranch'

diff --cc Client/carmainwindow.cpp
index 42b69af,25cdebc..47859e1
--- 1/Client/carmainwindow.cpp
--- 2/Client/carmainwindow.cpp
+++ b/Client/carmainwindow.cpp
@@@ -1,16 -1,15 +1,16 @@@
- /**
-   * CarMainWindow main class
-   *
-   * @author     Toni Jussila <toni.jussila@fudeco.com>
-   * @author     Janne Änäkkälä <janne.anakkala@fudeco.com>
-   * @author     Tiina Kivilinna-Korhola <tiina.kivilinna-korhola@fudeco.com>
-   * @author     Olavi Pulkkinen <olavi.pulkkinen@fudeco.com>
-   * @copyright  (c) 2010 Speed Freak team
-   * @license    http://opensource.org/licenses/gpl-license.php GNU Public License
-   */
+ /*
+  * CarMainWindow main class
+  *
+  * @author     Toni Jussila <toni.jussila@fudeco.com>
+  * @author     Janne Änäkkälä <janne.anakkala@fudeco.com>
+  * @author     Tiina Kivilinna-Korhola <tiina.kivilinna-korhola@fudeco.com>
+  * @author     Olavi Pulkkinen <olavi.pulkkinen@fudeco.com>
+  * @copyright  (c) 2010 Speed Freak team
+  * @license    http://opensource.org/licenses/gpl-license.php GNU Public License
+  */
  
  #include "carmainwindow.h"
 +#include "math.h"
  
  /**
    *Constructor of this class.

diff --cc Client/carmainwindow.h
Simple merge

diff --cc Client/measuredialog.cpp
index 02c9ea7,cba4877..e6813f2
--- 1/Client/measuredialog.cpp
--- 2/Client/measuredialog.cpp
+++ b/Client/measuredialog.cpp
@@@ -1,8 -1,14 +1,15 @@@
+ /*
+  * CarMainWindow main class
+  *
+  * @author     Janne Änäkkälä <janne.anakkala@fudeco.com>
+  * @copyright  (c) 2010 Speed Freak team
+  * @license    http://opensource.org/licenses/gpl-license.php GNU Public License
+  */
+ 
  #include "measuredialog.h"
  #include "ui_measuredialog.h"
 +#include "math.h"
  
- 
  /**
    * Constructor of this class.
    * @param QWidget pointer to parent object. By default the value is NULL.