projects
/
speedfreak
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Conflict solved: mainwindow.cpp and calculate.cpp
[speedfreak]
/
Client
/
main.cpp
diff --git
a/Client/main.cpp
b/Client/main.cpp
index
6e7efd9
..
dcf5597
100644
(file)
--- a/
Client/main.cpp
+++ b/
Client/main.cpp
@@
-1,3
+1,10
@@
+/*
+ * Main
+ *
+ * @copyright (c) 2010 Speed Freak team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ */
+
#include <QtGui/QApplication>
#include "mainwindow.h"