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
66ab41e
..
dcf5597
100644
(file)
--- a/
Client/main.cpp
+++ b/
Client/main.cpp
@@
-1,11
+1,17
@@
+/*
+ * Main
+ *
+ * @copyright (c) 2010 Speed Freak team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ */
+
#include <QtGui/QApplication>
#include <QtGui/QApplication>
-#include <QStyleFactory>
-#include "carmainwindow.h"
+#include "mainwindow.h"
int main(int argc, char *argv[])
{
QApplication a(argc, argv);
int main(int argc, char *argv[])
{
QApplication a(argc, argv);
- CarMainWindow w;
+ MainWindow w;
w.show();
return a.exec();
}
w.show();
return a.exec();
}