Checkbox

Merge lp:~cr3/checkbox/potfiles into lp:checkbox

  1. potfiles
  2. Merge into trunk
Proposed by Marc Tardif
Status: Merged
Merged at revision: 1522
Proposed branch: lp:~cr3/checkbox/potfiles
Merge into: lp:checkbox
Diff against target: 24 lines (+3/-0)
2 files modified
po/POTFILES.in (+2/-0)
setup.cfg (+1/-0)
To merge this branch: bzr merge lp:~cr3/checkbox/potfiles
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Review via email: mp+115424@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Manrique (roadmr) wrote :

Thanks for fixing this oversight! Merging...

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/POTFILES.in'
2--- po/POTFILES.in 2012-06-21 16:19:19 +0000
3+++ po/POTFILES.in 2012-07-17 19:37:17 +0000
4@@ -32,6 +32,8 @@
5 [type: gettext/rfc822deb] jobs/power-management.txt.in
6 [type: gettext/rfc822deb] jobs/resource.txt.in
7 [type: gettext/rfc822deb] jobs/server-services.txt.in
8+[type: gettext/rfc822deb] jobs/smoke.txt.in
9+[type: gettext/rfc822deb] jobs/sniff.txt.in
10 [type: gettext/rfc822deb] jobs/stress.txt.in
11 [type: gettext/rfc822deb] jobs/suspend.txt.in
12 [type: gettext/rfc822deb] jobs/touchpad.txt.in
13
14=== modified file 'setup.cfg'
15--- setup.cfg 2012-06-21 16:19:19 +0000
16+++ setup.cfg 2012-07-17 19:37:17 +0000
17@@ -39,6 +39,7 @@
18 "jobs/resource.txt.in",
19 "jobs/server-services.txt.in",
20 "jobs/smoke.txt.in",
21+ "jobs/sniff.txt.in",
22 "jobs/stress.txt.in",
23 "jobs/suspend.txt.in",
24 "jobs/touchpad.txt.in",

Subscribers

People subscribed via source and target branches