Conflict fixed: mainwindow.cpp and httpclient.cpp

[speedfreak] / Client / httpclient.h

diff --git a/Client/httpclient.h b/Client/httpclient.h
index 0f4283f..772d1b8 100644 (file)
--- a/Client/httpclient.h
+++ b/Client/httpclient.h
@@ -1,9 +1,11 @@
 /*
  * Http client Connects application to server.
  *
- * @author     Tiina Kivilinna-Korhola
- * @copyright  (c) 2010 Speed Freak team
- * license     http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @author      Tiina Kivilinna-Korhola
+ * @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
  */
 
 #ifndef HTTPCLIENT_H