Conflict

[speedfreak] / Client / accelerationstart.cpp

diff --git a/Client/accelerationstart.cpp b/Client/accelerationstart.cpp
index ab9198f..6214897 100644 (file)
--- a/Client/accelerationstart.cpp
+++ b/Client/accelerationstart.cpp
@@ -2,6 +2,7 @@
  * Acceleration start 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
  */