Merge lp:~gerboland/unity-mir/revert34 into lp:unity-mir

Proposed by Gerry Boland
Status: Merged
Approved by: Michał Sawicz
Approved revision: 35
Merged at revision: 54
Proposed branch: lp:~gerboland/unity-mir/revert34
Merge into: lp:unity-mir
Diff against target: 12 lines (+1/-1)
1 file modified
src/unity-mir/qmirserver.cpp (+1/-1)
To merge this branch: bzr merge lp:~gerboland/unity-mir/revert34
Reviewer Review Type Date Requested Status
Michał Sawicz Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+180338@code.launchpad.net

Commit message

Cflags change reverted in platform-api's pkgconfig file. Am doing the same, so reverting rev 34

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/unity-mir/qmirserver.cpp'
2--- src/unity-mir/qmirserver.cpp 2013-08-15 12:17:20 +0000
3+++ src/unity-mir/qmirserver.cpp 2013-08-15 13:04:29 +0000
4@@ -20,7 +20,7 @@
5 #include <mir/default_server_configuration.h>
6
7 // Platform API
8-#include <ubuntu/application/ubuntu_application_api_mirserver_priv.h>
9+#include <application/ubuntu_application_api_mirserver_priv.h>
10
11 // Qt
12 #include <QDebug>

Subscribers

People subscribed via source and target branches