Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/ignoreUpstream into lp:ubuntu-ui-toolkit/staging

Proposed by Christian Dywan on 2015-08-18
Status: Merged
Approved by: Zsombor Egri on 2015-08-21
Approved revision: 1612
Merged at revision: 1616
Proposed branch: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/ignoreUpstream
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 40 lines (+11/-11)
1 file modified
.bzrignore (+11/-11)
To merge this branch: bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/ignoreUpstream
Reviewer Review Type Date Requested Status
Zsombor Egri 2015-08-18 Approve on 2015-08-21
PS Jenkins bot continuous-integration Approve on 2015-08-18
Review via email: mp+268388@code.launchpad.net

Commit message

Update .bzrignore to new upstream style layout

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2015-05-20 14:47:16 +0000
3+++ .bzrignore 2015-08-18 21:10:37 +0000
4@@ -1,25 +1,25 @@
5+.obj
6+.pch
7+.qmake.cache
8+.rcc
9+qml
10+
11 Makefile*
12-src/Makefile*
13-src/Ubuntu/Components/Makefile*
14-src/Ubuntu/Components/plugin/Makefile*
15-src/Ubuntu/Components/plugin/qrc_plugin.cpp
16-src/Ubuntu/Components/Themes/Makefile*
17-src/Ubuntu/Components/Layouts/Makefile*
18-src/Ubuntu/Components/PerformanceMetrics/Makefile*
19-src/Ubuntu/Test/Makefile*
20 documentation/html/*
21 *.moc
22 moc_*.cpp
23 qrc_tst_*.cpp
24 tests/test_tst_*.xml
25 tests/tst_*.qml.xml
26-tests/unit*/tst_*/tst_[^.]*
27+tests/unit*/tst_*/tst_*
28+tests/unit/tst_*/tst_*/tst_*
29 tests/unit*/testparser/testparser
30 plugins.qmltypes
31 po/*.mo
32 examples/ubuntu-ui-toolkit-gallery/po/*.mo
33-tests/unit/tst_i18n/locale/en/LC_MESSAGES/*.mo
34+tests/unit/tst_i18n/tst_*/*/share/locale/en/LC_MESSAGES/*.mo
35+tests/unit/tst_i18n/*/share/locale/en/LC_MESSAGES/*.mo
36+tests/unit/tst_units/dpr*/dpr*
37 tests/apicheck/apicheck
38 tests/launcher/launcher
39 build_paths.inc
40-tests/unit/tst_i18n/localizedApp/share/locale/en/LC_MESSAGES/localizedApp.mo

Subscribers

People subscribed via source and target branches