Conflict

[speedfreak] / Client / accrealtimedialog.cpp

diff --git a/Client/accrealtimedialog.cpp b/Client/accrealtimedialog.cpp
index be150c2..bf34104 100644 (file)
--- a/Client/accrealtimedialog.cpp
+++ b/Client/accrealtimedialog.cpp
@@ -2,6 +2,7 @@
  * Acceleration info in real time dialog
  *
  * @author      Jukka Kurttila <jukka.kurttila@fudeco.com>
+ * @author      Toni Jussila   <toni.jussila@fudeco.com>
  * @copyright   (c) 2010 Speed Freak team
  * @license     http://opensource.org/licenses/gpl-license.php GNU Public License
  */