Code Review
/
staging
/
HomeScreen.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge of src and src2 folder
[staging/HomeScreen.git]
/
HomeScreen
/
src
/
main.cpp
diff --git
a/HomeScreen/src/main.cpp
b/HomeScreen/src/main.cpp
index
ef7a015
..
a4235de
100644
(file)
--- a/
HomeScreen/src/main.cpp
+++ b/
HomeScreen/src/main.cpp
@@
-23,9
+23,9
@@
#include "layouthandler.h"
#include "homescreencontrolinterface.h"
#include "layouthandler.h"
#include "homescreencontrolinterface.h"
-#include "
../src2/
applicationlauncher.h"
-#include "
../src2/
statusbarmodel.h"
-#include "
../src2/
applicationmodel.h"
+#include "applicationlauncher.h"
+#include "statusbarmodel.h"
+#include "applicationmodel.h"
void noOutput(QtMsgType, const QMessageLogContext &, const QString &)
{
void noOutput(QtMsgType, const QMessageLogContext &, const QString &)
{