Merge lp:~timo-jyrinki/ubuntu-ui-toolkit/test_jenkins_7_success into lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/jenkins-test

Proposed by Timo Jyrinki on 2016-01-15
Status: Merged
Approved by: Timo Jyrinki on 2016-01-15
Approved revision: 1807
Merged at revision: 1808
Proposed branch: lp:~timo-jyrinki/ubuntu-ui-toolkit/test_jenkins_7_success
Merge into: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/jenkins-test
Diff against target: 19 lines (+2/-2)
1 file modified
ubuntu-sdk.pro (+2/-2)
To merge this branch: bzr merge lp:~timo-jyrinki/ubuntu-ui-toolkit/test_jenkins_7_success
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve on 2016-01-15
Ubuntu SDK team 2016-01-15 Pending
Review via email: mp+282756@code.launchpad.net

Commit message

this another test commit message that should be included in the merge.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu-sdk.pro'
2--- ubuntu-sdk.pro 2016-01-15 11:45:04 +0000
3+++ ubuntu-sdk.pro 2016-01-15 13:45:18 +0000
4@@ -1,5 +1,5 @@
5 #include( documentation/documentation.pri )
6-
7+
8 BUILD_PATH_CONTENTS="SRC_DIR=\"$$PWD\"" \
9 "BUILD_DIR=\"$$OUT_PWD\""
10
11@@ -7,7 +7,7 @@
12
13 requires(qtHaveModule(quick))
14 load(qt_parts)
15-
16+
17 SUBDIRS += po documentation app-launch-profiler ubuntu-ui-toolkit-launcher apicheck
18
19 sub_tests.CONFIG -= no_default_target

Subscribers

People subscribed via source and target branches

to all changes: