Merge lp:~didrocks/oneconf/newcontent into lp:~didrocks/oneconf/testmerge

Proposed by Didier Roche
Status: Merged
Merged at revision: 276
Proposed branch: lp:~didrocks/oneconf/newcontent
Merge into: lp:~didrocks/oneconf/testmerge
Diff against target: 16 lines (+1/-2)
2 files modified
.bzr-builddeb/default.conf (+1/-1)
AUTHORS (+0/-1)
To merge this branch: bzr merge lp:~didrocks/oneconf/newcontent
Reviewer Review Type Date Requested Status
Didier Roche Pending
Review via email: mp+200373@code.launchpad.net

Commit message

commit message for new content

Description of the change

Change description

To post a comment you must log in.
lp:~didrocks/oneconf/newcontent updated
277. By Didier Roche

move to split mode

278. By Didier Roche

commit releasing <…>

279. By Didier Roche

enable package to build

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzr-builddeb/default.conf'
2--- .bzr-builddeb/default.conf 2010-07-29 18:26:10 +0000
3+++ .bzr-builddeb/default.conf 2014-01-03 07:56:32 +0000
4@@ -1,2 +1,2 @@
5 [BUILDDEB]
6-native = True
7+split = True
8
9=== modified file 'AUTHORS'
10--- AUTHORS 2014-01-03 07:48:13 +0000
11+++ AUTHORS 2014-01-03 07:56:32 +0000
12@@ -4,4 +4,3 @@
13 Michael Vogt - Coding
14 Didier Roche - Coding
15
16-

Subscribers

People subscribed via source and target branches

to all changes: