Ubuntu One Client

Merge lp:~nataliabidart/ubuntuone-client/ignore-po into lp:ubuntuone-client

  1. ignore-po
  2. Merge into trunk
Proposed by Natalia Bidart on 2012-01-03
Status: Merged
Approved by: Natalia Bidart on 2012-01-03
Approved revision: 1174
Merged at revision: 1174
Proposed branch: lp:~nataliabidart/ubuntuone-client/ignore-po
Merge into: lp:ubuntuone-client
Diff against target: 12 lines (+3/-1)
1 file modified
po/POTFILES.skip (+3/-1)
To merge this branch: bzr merge lp:~nataliabidart/ubuntuone-client/ignore-po
Reviewer Review Type Date Requested Status
dobey (community) 2012-01-03 Approve on 2012-01-03
Review via email: mp+87383@code.launchpad.net

Commit Message

- Adding files to POTFILES.skip to avoid make errors (LP: #911306).

To post a comment you must log in.
dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/POTFILES.skip'
2--- po/POTFILES.skip 2011-06-24 20:27:52 +0000
3+++ po/POTFILES.skip 2012-01-03 16:41:25 +0000
4@@ -1,5 +1,7 @@
5+contrib/testing/testcase.py
6 tests/platform/linux/test_tools.py
7 tests/syncdaemon/test_hashqueue.py
8 tests/syncdaemon/test_vm.py
9 ubuntuone/__init__.py
10-
11+ubuntuone/clientdefs.py
12+windows/clientdefs.py

Subscribers

People subscribed via source and target branches