Conflict

[speedfreak] / Client / routedialog.cpp

diff --git a/Client/routedialog.cpp b/Client/routedialog.cpp
index 6edb716..6b5e468 100644 (file)
--- a/Client/routedialog.cpp
+++ b/Client/routedialog.cpp
@@ -1,7 +1,8 @@
 /*
  * RouteDialog class
  *
- * @author     Olavi Pulkkinen <olavi.pulkkinen@fudeco.com>
+ * @author      Olavi Pulkkinen <olavi.pulkkinen@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
  */