Conflict solved: mainwindow.cpp and calculate.cpp

[speedfreak] / Client / mainwindow.h

diff --git a/Client/mainwindow.h b/Client/mainwindow.h
index 94f093c..ed0e5ad 100644 (file)
--- a/Client/mainwindow.h
+++ b/Client/mainwindow.h
@@ -3,6 +3,7 @@
  *
  * @author      Rikhard Kuutti  <rikhard.kuutti@fudeco.com>
  * @author      Toni Jussila   <toni.jussila@fudeco.com>
+ * @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
  */