Merge lp:~aacid/unity-2d/unity-2d_fix_bzrignore into lp:unity-2d

Proposed by Albert Astals Cid
Status: Merged
Approved by: Gerry Boland
Approved revision: 854
Merged at revision: 854
Proposed branch: lp:~aacid/unity-2d/unity-2d_fix_bzrignore
Merge into: lp:unity-2d
Diff against target: 18 lines (+3/-0)
1 file modified
.bzrignore (+3/-0)
To merge this branch: bzr merge lp:~aacid/unity-2d/unity-2d_fix_bzrignore
Reviewer Review Type Date Requested Status
Gerry Boland (community) Approve
Review via email: mp+89068@code.launchpad.net

Description of the change

Add two more files to .bzrignore

To post a comment you must log in.
Revision history for this message
Gerry Boland (gerboland) wrote :

Ah good catch, my bad. Approved!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2011-11-23 14:04:19 +0000
3+++ .bzrignore 2012-01-18 16:16:23 +0000
4@@ -37,11 +37,14 @@
5 libunity-2d-private/tests/paneltest
6 libunity-2d-private/tests/qsortfilterproxymodeltest
7 libunity-2d-private/tests/unity2dtrtest
8+libunity-2d-private/tests/unity2dtrtest.sh
9 libunity-2d-private/Unity2d/qrc_launchermenu.cxx
10 libunity-2d-private/Unity2d/launchermenu/launchermenu.qrc.depends
11
12 po/*.gmo
13
14+tests/misc/binary_dir.txt
15+
16 # Cmake files and generated files
17 Makefile
18 .bzr-repo

Subscribers

People subscribed via source and target branches