projects
/
situare
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6a032ca
fbf91de
)
Merge branch 'master' into login_browser
author
Sami Rämö
<sami.ramo@ixonos.com>
Mon, 8 Nov 2010 07:43:59 +0000
(09:43 +0200)
committer
Sami Rämö
<sami.ramo@ixonos.com>
Mon, 8 Nov 2010 07:43:59 +0000
(09:43 +0200)
1
2
src/facebookservice/facebookauthentication.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/situareservice/situareservice.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/src.pro
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/facebookservice/facebookauthentication.cpp
Simple merge
diff --cc
src/situareservice/situareservice.cpp
index
517758f
,
ed789ad
..
87847c4
---
1
/
src/situareservice/situareservice.cpp
---
2
/
src/situareservice/situareservice.cpp
+++ b/
src/situareservice/situareservice.cpp
@@@
-19,8
-19,9
+19,8
@@@
USA.
*/
- #include "parser.h"
+ #include <qjson/parser.h>
-#include <QtAlgorithms>
#include <QDebug>
#include <QNetworkReply>
#include <QPixmap>
diff --cc
src/src.pro
Simple merge