Changeset e4f08bf for debian/control


Ignore:
Timestamp:
2015-06-08T18:25:08Z (10 years ago)
Author:
dequis <dx@…>
Children:
29ff5c2
Parents:
c720890 (diff), 61e7e02 (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 'develop' into feat/hip-cat

Conflicts:

configure

File:
1 edited

Legend:

Unmodified
Added
Removed

  • debian/control

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