Merge lp:~ubuntu-branches/ubuntu/natty/gobject-introspection/natty-201102031612 into lp:ubuntu/natty/gobject-introspection

Proposed by James Westby
Status: Merged
Merged at revision: 42
Proposed branch: lp:~ubuntu-branches/ubuntu/natty/gobject-introspection/natty-201102031612
Merge into: lp:ubuntu/natty/gobject-introspection
Diff against target: 8 lines (+1/-0)
1 file modified
.pc/.version (+1/-0)
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/natty/gobject-introspection/natty-201102031612
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+48499@code.launchpad.net

Description of the change

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/natty/gobject-introspection now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/gobject-introspection/natty-201102031612. A merge should be performed if necessary.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory '.pc'
2=== added file '.pc/.version'
3--- .pc/.version 1970-01-01 00:00:00 +0000
4+++ .pc/.version 2011-02-03 16:17:55 +0000
5@@ -0,0 +1,1 @@
6+2
7
8=== added directory 'debian/patches'

Subscribers

People subscribed via source and target branches

to all changes: