Unmerged changes from Debian

Bug #9692 reported by Debian Bug Importer
4
Affects Status Importance Assigned to Milestone
xosd (Ubuntu)
Fix Released
Medium
James Troup

Bug Description

The xosd package has been updated in Debian, and those changes
        need to be merged into Ubuntu. An automatic merge was
        attempted, but was not able to process all of the changes.

        The output from the automatic attempt can be found here:

        http://people.ubuntu.com/~scott/merge/review/xosd

        Some documentation about the output can be found here:

        http://people.ubuntu.com/~scott/merge/README

Revision history for this message
Daniel Stone (daniels) wrote :

2.2.11-3 sync requested from Debian.

Revision history for this message
Daniel Stone (daniels) wrote :

Synced.

To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.