Compiz

Merge lp:~3v1n0/compiz/vivid-rebuild-ddebs into lp:compiz/0.9.12

  1. vivid-rebuild-ddebs
  2. Merge into 0.9.12
Proposed by Marco Trevisan (Treviño) on 2015-09-22
Status: Superseded
Proposed branch: lp:~3v1n0/compiz/vivid-rebuild-ddebs
Merge into: lp:compiz/0.9.12
Diff against target: 23 lines (+9/-0) (has conflicts)
1 file modified
debian/changelog (+9/-0)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~3v1n0/compiz/vivid-rebuild-ddebs
Reviewer Review Type Date Requested Status
Compiz Maintainers 2015-09-22 Pending
Review via email: mp+271930@code.launchpad.net

Commit Message

debian/changelog: No change rebuild, to get ddebs built for vivid

Description of the Change

debian/changelog: No change rebuild, to get ddebs built for vivid

To post a comment you must log in.

Unmerged revisions

3948. By Marco Trevisan (Treviño) on 2015-09-22

debian/changelog: No change rebuild, to get ddebs built for vivid

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-09-08 11:36:16 +0000
3+++ debian/changelog 2015-09-22 09:37:04 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 compiz (1:0.9.12.2+15.10.20150908-0ubuntu1) wily; urgency=medium
7
8 [ Stephen M. Webb ]
9@@ -107,6 +108,14 @@
10
11 -- CI Train Bot <ci-train-bot@canonical.com> Mon, 11 May 2015 16:39:16 +0000
12
13+=======
14+compiz (1:0.9.12.1+15.04.20150410.1-0ubuntu2) UNRELEASED; urgency=medium
15+
16+ * No change rebuild, to get ddebs built for vivid
17+
18+ -- Marco Trevisan (Treviño) <marco@ubuntu.com> Tue, 22 Sep 2015 11:29:23 +0200
19+
20+>>>>>>> MERGE-SOURCE
21 compiz (1:0.9.12.1+15.04.20150410.1-0ubuntu1) vivid; urgency=medium
22
23 [ CI Train Bot ]

Subscribers

People subscribed via source and target branches