Changeset 5014380


Ignore:
Timestamp:
2015-05-09T19:37:03Z (5 years ago)
Author:
dequis <dx@…>
Branches:
master
Children:
2730c79, b8c336b
Parents:
088b070 (diff), 70e68cf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into develop

File:
1 edited

Legend:

Unmodified
Added
Removed
  • debian/control

    r088b070 r5014380  
    2222Architecture: any
    2323Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${source:Version})
     24Provides: bitlbee
    2425Conflicts: bitlbee
    2526Replaces: bitlbee
Note: See TracChangeset for help on using the changeset viewer.