projects
/
irwi
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
346ae43
)
Fixed a broken merge
author
Torste Aikio
<zokier@zokier.laptop>
Wed, 7 Jul 2010 08:00:30 +0000
(11:00 +0300)
committer
Torste Aikio
<zokier@zokier.laptop>
Wed, 7 Jul 2010 08:00:30 +0000
(11:00 +0300)
src/onlinepollerthread.cpp
patch
|
blob
|
history
diff --git
a/src/onlinepollerthread.cpp
b/src/onlinepollerthread.cpp
index
7513b8d
..
6e1cdac
100644
(file)
--- a/
src/onlinepollerthread.cpp
+++ b/
src/onlinepollerthread.cpp
@@
-18,18
+18,11
@@
void OnlinePollerThread::run()
if (!qncm.isOnline()) {
msleep(250);
} else {
-<<<<<<< HEAD
-=======
emit online();
->>>>>>> 2fd880d... Removed onlinepollerthread
break;
}
}
}
-<<<<<<< HEAD
- emit online();
-=======
->>>>>>> 2fd880d... Removed onlinepollerthread
exec();
}